From 67a1e576db7e4e1075b3f181fe40abff8c73b095 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Fri, 24 Feb 2012 10:53:42 -0500
Subject: [PATCH] [svn-r21983] Correct HD prefix in tools Checked for HD
 support.

---
 tools/h5ls/h5ls.c    | 4 ++--
 tools/misc/h5debug.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 905f10c1ae..6337231ad3 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -3352,8 +3352,8 @@ get_width(void)
 
     /* Try to get it from the COLUMNS environment variable first since it's
      * value is sometimes wrong. */
-    if ((s=getenv("COLUMNS")) && *s && isdigit((int)*s))
-        width = (int)strtol(s, NULL, 0);
+    if ((s=HDgetenv("COLUMNS")) && *s && isdigit((int)*s))
+        width = (int)HDstrtol(s, NULL, 0);
 
 #if defined(H5_HAVE_STRUCT_VIDEOCONFIG) && defined(H5_HAVE__GETVIDEOCONFIG)
     {
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index 021cfcda8b..30d5d3bd2d 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -246,7 +246,7 @@ main(int argc, char *argv[])
         HDfprintf(stderr, "cannot create file access property list\n");
         HDexit(1);
     } /* end if */
-    if(strchr(argv[1], '%'))
+    if(HDstrchr(argv[1], '%'))
   H5Pset_fapl_family (fapl, (hsize_t)0, H5P_DEFAULT);
     if((fid = H5Fopen(argv[1], H5F_ACC_RDONLY, fapl)) < 0) {
         HDfprintf(stderr, "cannot open file\n");