[svn-r4473] Purpose:

    Code cleanup for better compatibility with C++ compilers
Description:
    C++ compilers are choking on our C code, for various reasons:
        we used our UNUSED macro incorrectly when referring to pointer types
        we used various C++ keywords as variables, etc.
        we incremented enum's with the ++ operator.
Solution:
    Changed variables, etc.to avoid C++ keywords (new, class, typename, typeid,
        template)

    Fixed usage of UNUSED macro from this:
        char UNUSED *c
    to this:
        char * UNUSED c

    Switched the enums from x++ to x=x+1
Platforms tested:
    FreeBSD 4.4 (hawkwind)

23 files changed, 138 insertions, 138 deletions

diff --git a/src/H5.c b/src/H5.c
index 3d99998..b69d118 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -732,7 +732,7 @@ HDfprintf (FILE *stream, const char *fmt, ...)
     int		prefix;
     char	modifier[8];
     int		conv;
-    char	*rest, template[128];
+    char	*rest, format_templ[128];
     const char	*s;
     va_list	ap;
     
@@ -844,19 +844,19 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 	    conv = *s++;
 
 	    /* Create the format template */
-	    sprintf (template, "%%%s%s%s%s%s",
+	    sprintf (format_templ, "%%%s%s%s%s%s",
 		     leftjust?"-":"", plussign?"+":"",
 		     ldspace?" ":"", prefix?"#":"", zerofill?"0":"");
 	    if (fwidth>0) {
-		sprintf (template+HDstrlen(template), "%d", fwidth);
+		sprintf (format_templ+HDstrlen(format_templ), "%d", fwidth);
 	    }
 	    if (prec>0) {
-		sprintf (template+HDstrlen(template), ".%d", prec);
+		sprintf (format_templ+HDstrlen(format_templ), ".%d", prec);
 	    }
 	    if (*modifier) {
-		sprintf (template+HDstrlen(template), "%s", modifier);
+		sprintf (format_templ+HDstrlen(format_templ), "%s", modifier);
 	    }
-	    sprintf (template+HDstrlen(template), "%c", conv);
+	    sprintf (format_templ+HDstrlen(format_templ), "%c", conv);
 	    
 
 	    /* Conversion */
@@ -865,16 +865,16 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 	    case 'i':
 		if (!HDstrcmp(modifier, "h")) {
 		    short x = va_arg (ap, int);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		} else if (!*modifier) {
 		    int x = va_arg (ap, int);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		} else if (!HDstrcmp (modifier, "l")) {
 		    long x = va_arg (ap, long);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		} else {
 		    int64_t x = va_arg(ap, int64_t);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		}
 		break;
 
@@ -884,16 +884,16 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 	    case 'X':
 		if (!HDstrcmp (modifier, "h")) {
 		    unsigned short x = va_arg (ap, unsigned int);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		} else if (!*modifier) {
 		    unsigned int x = va_arg (ap, unsigned int);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		} else if (!HDstrcmp (modifier, "l")) {
 		    unsigned long x = va_arg (ap, unsigned long);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		} else {
 		    uint64_t x = va_arg(ap, uint64_t);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		}
 		break;
 
@@ -904,10 +904,10 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 	    case 'G':
 		if (!HDstrcmp (modifier, "h")) {
 		    float x = va_arg (ap, double);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		} else if (!*modifier || !HDstrcmp (modifier, "l")) {
 		    double x = va_arg (ap, double);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		} else {
 		    /*
 		     * Some compilers complain when `long double' and
@@ -915,10 +915,10 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 		     */
 #if SIZEOF_LONG_DOUBLE != SIZEOF_DOUBLE
 		    long double x = va_arg (ap, long double);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 #else
 		    double x = va_arg (ap, double);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 #endif
 		}
 		break;
@@ -927,30 +927,30 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 		if (1) {
 		    haddr_t x = va_arg (ap, haddr_t);
 		    if (H5F_addr_defined(x)) {
-			sprintf(template, "%%%s%s%s%s%s",
+			sprintf(format_templ, "%%%s%s%s%s%s",
 				leftjust?"-":"", plussign?"+":"",
 				ldspace?" ":"", prefix?"#":"",
 				zerofill?"0":"");
 			if (fwidth>0) {
-			    sprintf(template+HDstrlen(template), "%d", fwidth);
+			    sprintf(format_templ+HDstrlen(format_templ), "%d", fwidth);
 			}
 			if (sizeof(x)==SIZEOF_INT) {
-			    HDstrcat(template, "d");
+			    HDstrcat(format_templ, "d");
 			} else if (sizeof(x)==SIZEOF_LONG) {
-			    HDstrcat(template, "ld");
+			    HDstrcat(format_templ, "ld");
 			} else if (sizeof(x)==SIZEOF_LONG_LONG) {
-			    HDstrcat(template, PRINTF_LL_WIDTH);
-			    HDstrcat(template, "d");
+			    HDstrcat(format_templ, PRINTF_LL_WIDTH);
+			    HDstrcat(format_templ, "d");
 			}
-			n = fprintf(stream, template, x);
+			n = fprintf(stream, format_templ, x);
 		    } else {
-			HDstrcpy(template, "%");
-			if (leftjust) HDstrcat(template, "-");
+			HDstrcpy(format_templ, "%");
+			if (leftjust) HDstrcat(format_templ, "-");
 			if (fwidth) {
-			    sprintf(template+HDstrlen(template), "%d", fwidth);
+			    sprintf(format_templ+HDstrlen(format_templ), "%d", fwidth);
 			}
-			HDstrcat(template, "s");
-			fprintf(stream, template, "UNDEF");
+			HDstrcat(format_templ, "s");
+			fprintf(stream, format_templ, "UNDEF");
 		    }
 		}
 		break;
@@ -958,7 +958,7 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 	    case 'c':
 		if (1) {
 		    char x = (char)va_arg (ap, int);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		}
 		break;
 
@@ -966,20 +966,20 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 	    case 'p':
 		if (1) {
 		    char *x = va_arg (ap, char*);
-		    n = fprintf (stream, template, x);
+		    n = fprintf (stream, format_templ, x);
 		}
 		break;
 
 	    case 'n':
 		if (1) {
-		    template[HDstrlen(template)-1] = 'u';
-		    n = fprintf (stream, template, nout);
+		    format_templ[HDstrlen(format_templ)-1] = 'u';
+		    n = fprintf (stream, format_templ, nout);
 		}
 		break;
 
 	    default:
-		HDfputs (template, stream);
-		n = (int)HDstrlen (template);
+		HDfputs (format_templ, stream);
+		n = (int)HDstrlen (format_templ);
 		break;
 	    }
 	    nout += n;
@@ -1413,10 +1413,10 @@ H5_trace (hbool_t returning, const char *func, const char *type, ...)
 		    fprintf(out, "NULL");
 		}
 	    } else {
-		hbool_t bool = va_arg (ap, hbool_t);
-		if (TRUE==bool) fprintf (out, "TRUE");
-		else if (!bool) fprintf (out, "FALSE");
-		else fprintf (out, "TRUE(%u)", (unsigned)bool);
+		hbool_t bool_var = va_arg (ap, hbool_t);
+		if (TRUE==bool_var) fprintf (out, "TRUE");
+		else if (!bool_var) fprintf (out, "FALSE");
+		else fprintf (out, "TRUE(%u)", (unsigned)bool_var);
 	    }
 	    break;
 
diff --git a/src/H5Distore.c b/src/H5Distore.c
index fc89a8d..c5f12a3 100644
--- a/src/H5Distore.c
+++ b/src/H5Distore.c
@@ -656,7 +656,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
  */
 static herr_t
 H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key,
-		 void *_udata, const void UNUSED *_rt_key)
+		 void *_udata, const void * UNUSED _rt_key)
 {
     H5F_istore_ud1_t	   *udata = (H5F_istore_ud1_t *) _udata;
     const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key;
diff --git a/src/H5F.c b/src/H5F.c
index 17b8ee3..0ff503c 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -2010,7 +2010,7 @@ done:
  */
 static herr_t
 H5F_mount(H5G_entry_t *loc, const char *name, H5F_t *child,
-	  const H5F_mprop_t UNUSED *plist)
+	  const H5F_mprop_t * UNUSED plist)
 {
     H5G_t	*mount_point = NULL;	/*mount point group		*/
     H5G_entry_t	*mp_ent = NULL;		/*mount point symbol table entry*/
diff --git a/src/H5FD.c b/src/H5FD.c
index 25d5206..fb7d77b 100644
--- a/src/H5FD.c
+++ b/src/H5FD.c
@@ -189,7 +189,7 @@ H5FDregister(const H5FD_class_t *cls)
 	HRETURN_ERROR(H5E_ARGS, H5E_UNINITIALIZED, FAIL,
 		      "`read' and/or `write' method is not defined");
     }
-    for (type=H5FD_MEM_DEFAULT; type<H5FD_MEM_NTYPES; type++) {
+    for (type=H5FD_MEM_DEFAULT; type<H5FD_MEM_NTYPES; type = type+1) {
 	if (cls->fl_map[type]<H5FD_MEM_NOLIST ||
 	    cls->fl_map[type]>=H5FD_MEM_NTYPES) {
 	    HRETURN_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,
@@ -870,7 +870,7 @@ H5FD_close(H5FD_t *file)
     /* Free all free-lists, leaking any memory thus described. Also leaks
      * file space allocated but not used when metadata aggregation is
      * turned on. */
-    for (i=H5FD_MEM_DEFAULT; i<H5FD_MEM_NTYPES; i++) {
+    for (i=H5FD_MEM_DEFAULT; i<H5FD_MEM_NTYPES; i=i+1) {
 	for (cur=file->fl[i]; cur; cur=next) {
 #ifdef H5F_DEBUG
 	    nblocks++;
diff --git a/src/H5FDfamily.c b/src/H5FDfamily.c
index 43f4793..5f67f03 100644
--- a/src/H5FDfamily.c
+++ b/src/H5FDfamily.c
@@ -628,7 +628,7 @@ H5FD_family_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_family_query(const H5FD_t UNUSED *_f, unsigned long *flags /* out */)
+H5FD_family_query(const H5FD_t * UNUSED _f, unsigned long *flags /* out */)
 {
     herr_t ret_value=SUCCEED;
 
diff --git a/src/H5FDlog.c b/src/H5FDlog.c
index f28ae0e..968057a 100644
--- a/src/H5FDlog.c
+++ b/src/H5FDlog.c
@@ -681,7 +681,7 @@ H5FD_log_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_log_query(const H5FD_t UNUSED *_f, unsigned long *flags /* out */)
+H5FD_log_query(const H5FD_t * UNUSED _f, unsigned long *flags /* out */)
 {
     herr_t ret_value=SUCCEED;
 
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c
index 2c880a6..fb8aa59 100644
--- a/src/H5FDmulti.c
+++ b/src/H5FDmulti.c
@@ -41,7 +41,7 @@
     hbool_t _seen[H5FD_MEM_NTYPES];					      \
 									      \
     memset(_seen, 0, sizeof _seen);					      \
-    for (_unmapped=H5FD_MEM_SUPER; _unmapped<H5FD_MEM_NTYPES; _unmapped++) {  \
+    for (_unmapped=H5FD_MEM_SUPER; _unmapped<H5FD_MEM_NTYPES; _unmapped=_unmapped+1) {  \
 	LOOPVAR = MAP[_unmapped];					      \
 	if (H5FD_MEM_DEFAULT==LOOPVAR) LOOPVAR=_unmapped;		      \
 	assert(LOOPVAR>0 && LOOPVAR<H5FD_MEM_NTYPES);			      \
@@ -50,14 +50,14 @@
 #define MAPPED_MEMBERS(MAP,LOOPVAR) {					      \
     H5FD_mem_t _unmapped, LOOPVAR;					      \
 									      \
-    for (_unmapped=H5FD_MEM_SUPER; _unmapped<H5FD_MEM_NTYPES; _unmapped++) {  \
+    for (_unmapped=H5FD_MEM_SUPER; _unmapped<H5FD_MEM_NTYPES; _unmapped=_unmapped+1) {  \
 	LOOPVAR = MAP[_unmapped];					      \
 	if (H5FD_MEM_DEFAULT==LOOPVAR) LOOPVAR=_unmapped;		      \
 	assert(LOOPVAR>0 && LOOPVAR<H5FD_MEM_NTYPES);
 
 #define ALL_MEMBERS(LOOPVAR) {						      \
     H5FD_mem_t LOOPVAR;							      \
-    for (LOOPVAR=H5FD_MEM_DEFAULT; LOOPVAR<H5FD_MEM_NTYPES; LOOPVAR++) {
+    for (LOOPVAR=H5FD_MEM_DEFAULT; LOOPVAR<H5FD_MEM_NTYPES; LOOPVAR=LOOPVAR+1) {
 	
 
 #define END_MEMBERS	}}
@@ -256,7 +256,7 @@ H5Pset_fapl_split(hid_t fapl, const char *meta_ext, hid_t meta_plist_id,
     H5Eclear();
 
     /* Initialize */
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	memb_map[mt] = (H5FD_MEM_DRAW==mt?mt:H5FD_MEM_SUPER);
 	memb_fapl[mt] = -1;
 	memb_name[mt] = NULL;
@@ -401,33 +401,33 @@ H5Pset_fapl_multi(hid_t fapl_id, const H5FD_mem_t *memb_map,
     if (H5P_FILE_ACCESS!=H5Pget_class(fapl_id))
         H5Epush_ret(func, H5E_PLIST, H5E_BADVALUE, "not a file access property list", -1);
     if (!memb_map) {
-	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	    _memb_map[mt] = H5FD_MEM_DEFAULT;
 	}
 	memb_map = _memb_map;
     }
     if (!memb_fapl) {
-	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	    _memb_fapl[mt] = H5P_DEFAULT;
 	}
 	memb_fapl = _memb_fapl;
     }
     if (!memb_name) {
 	assert(strlen(letters)==H5FD_MEM_NTYPES);
-	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	    sprintf(_memb_name[mt], "%%s-%c.h5", letters[mt]);
 	    _memb_name_ptrs[mt] = _memb_name[mt];
 	}
 	memb_name = _memb_name_ptrs;
     }
     if (!memb_addr) {
-	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	    _memb_addr[mt] = (mt?mt-1:0) * HADDR_MAX/H5FD_MEM_NTYPES;
 	}
 	memb_addr = _memb_addr;
     }
     
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	/* Map usage type */
 	mmt = memb_map[mt];
 	if (mmt<0 || mmt>=H5FD_MEM_NTYPES)
@@ -502,7 +502,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
         memcpy(memb_map, fa->memb_map, H5FD_MEM_NTYPES*sizeof(H5FD_mem_t));
     }
     if (memb_fapl) {
-	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	    if (fa->memb_fapl[mt]>=0) {
 		memb_fapl[mt] = H5Pcopy(fa->memb_fapl[mt]);
 	    } else {
@@ -511,7 +511,7 @@ H5Pget_fapl_multi(hid_t fapl_id, H5FD_mem_t *memb_map/*out*/,
 	}
     }
     if (memb_name) {
-	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	    if (fa->memb_name[mt]) {
 		memb_name[mt] = malloc(strlen(fa->memb_name[mt])+1);
 		strcpy(memb_name[mt], fa->memb_name[mt]);
@@ -567,7 +567,7 @@ H5Pset_dxpl_multi(hid_t dxpl_id, const hid_t *memb_dxpl)
         H5Epush_ret(func, H5E_PLIST, H5E_BADTYPE, "not a data transfer property list", -1);
     if (!memb_dxpl)
         H5Epush_ret(func, H5E_INTERNAL, H5E_BADVALUE, "invalid pointer", -1);
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	if (H5P_DEFAULT!=memb_dxpl[mt] &&
 	    H5P_DATASET_XFER!=H5Pget_class(memb_dxpl[mt]))
             H5Epush_ret(func, H5E_PLIST, H5E_BADTYPE, "not a data transfer property list", -1);
@@ -616,7 +616,7 @@ H5Pget_dxpl_multi(hid_t dxpl_id, hid_t *memb_dxpl/*out*/)
         H5Epush_ret(func, H5E_PLIST, H5E_BADVALUE, "bad VFL driver info", -1);
 
     if (memb_dxpl) {
-	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+	for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	    if (dx->memb_dxpl[mt]>=0) {
 		memb_dxpl[mt] = H5Pcopy(dx->memb_dxpl[mt]);
 	    } else {
@@ -718,7 +718,7 @@ H5FD_multi_sb_encode(H5FD_t *_file, char *name/*out*/,
     strcpy(name, "NCSAmulti");
 
     assert(7==H5FD_MEM_NTYPES);
-    for (m=H5FD_MEM_SUPER; m<H5FD_MEM_NTYPES; m++) {
+    for (m=H5FD_MEM_SUPER; m<H5FD_MEM_NTYPES; m=m+1) {
         buf[m-1] = file->fa.memb_map[m];
     }
     buf[7] = 0;
@@ -978,7 +978,7 @@ H5FD_multi_fapl_copy(const void *_old_fa)
     H5Eclear();
 
     memcpy(new_fa, old_fa, sizeof(H5FD_multi_fapl_t));
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	if (old_fa->memb_fapl[mt]>=0) {
 	    new_fa->memb_fapl[mt] = H5Pcopy(old_fa->memb_fapl[mt]);
 	    if (new_fa->memb_fapl[mt]<0) nerrors++;
@@ -991,7 +991,7 @@ H5FD_multi_fapl_copy(const void *_old_fa)
     }
 
     if (nerrors) {
-        for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+        for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
             if (new_fa->memb_fapl[mt]>=0) H5Pclose(new_fa->memb_fapl[mt]);
             if (new_fa->memb_name[mt]) free(new_fa->memb_name[mt]);
         }
@@ -1027,7 +1027,7 @@ H5FD_multi_fapl_free(void *_fa)
     /* Clear the error stack */
     H5Eclear();
 
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	if (fa->memb_fapl[mt]>=0) H5Pclose(fa->memb_fapl[mt]);
 	if (fa->memb_name[mt]) free(fa->memb_name[mt]);
     }
@@ -1067,7 +1067,7 @@ H5FD_multi_dxpl_copy(const void *_old_dx)
     H5Eclear();
 
     memcpy(new_dx, old_dx, sizeof(H5FD_multi_dxpl_t));
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	if (old_dx->memb_dxpl[mt]>=0) {
 	    new_dx->memb_dxpl[mt] = H5Pcopy(old_dx->memb_dxpl[mt]);
 	    if (new_dx->memb_dxpl[mt]<0) nerrors++;
@@ -1075,7 +1075,7 @@ H5FD_multi_dxpl_copy(const void *_old_dx)
     }
 
     if (nerrors) {
-        for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++)
+        for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1)
             H5Pclose(new_dx->memb_dxpl[mt]);
         free(new_dx);
         H5Epush_ret(func, H5E_INTERNAL, H5E_BADVALUE, "invalid freespace objects", NULL);
@@ -1109,7 +1109,7 @@ H5FD_multi_dxpl_free(void *_dx)
     /* Clear the error stack */
     H5Eclear();
 
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++)
+    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1)
         if (dx->memb_dxpl[mt]>=0)
             H5Pclose(dx->memb_dxpl[mt]);
     free(dx);
@@ -1312,7 +1312,7 @@ H5FD_multi_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
     /* Clear the error stack */
     H5Eclear();
 
-    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_DEFAULT; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	if (f1->memb[mt] && f2->memb[mt]) break;
 	if (!cmp) {
 	    if (f1->memb[mt]) cmp = -1;
@@ -1420,7 +1420,7 @@ H5FD_multi_set_eoa(H5FD_t *_file, haddr_t eoa)
     H5Eclear();
 
     /* Find the subfile in which the new EOA value falls */
-    for (mt=H5FD_MEM_SUPER; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_SUPER; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	mmt = file->fa.memb_map[mt];
 	if (H5FD_MEM_DEFAULT==mmt) mmt = mt;
 	assert(mmt>0 && mmt<H5FD_MEM_NTYPES);
@@ -1610,7 +1610,7 @@ H5FD_multi_read(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, siz
     }
     
     /* Find the file to which this address belongs */
-    for (mt=H5FD_MEM_SUPER; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_SUPER; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	mmt = file->fa.memb_map[mt];
 	if (H5FD_MEM_DEFAULT==mmt) mmt = mt;
 	assert(mmt>0 && mmt<H5FD_MEM_NTYPES);
@@ -1665,7 +1665,7 @@ H5FD_multi_write(H5FD_t *_file, H5FD_mem_t type, hid_t dxpl_id, haddr_t addr, si
     }
     
     /* Find the file to which this address belongs */
-    for (mt=H5FD_MEM_SUPER; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_SUPER; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	mmt = file->fa.memb_map[mt];
 	if (H5FD_MEM_DEFAULT==mmt) mmt = mt;
 	assert(mmt>0 && mmt<H5FD_MEM_NTYPES);
@@ -1744,7 +1744,7 @@ H5FD_multi_flush(H5FD_t *_file)
     H5Eclear();
 
     /* Flush each file */
-    for (mt=H5FD_MEM_SUPER; mt<H5FD_MEM_NTYPES; mt++) {
+    for (mt=H5FD_MEM_SUPER; mt<H5FD_MEM_NTYPES; mt=mt+1) {
 	if (file->memb[mt]) {
 	    H5E_BEGIN_TRY {
 		if (H5FDflush(file->memb[mt])<0) nerrors++;
diff --git a/src/H5FDsec2.c b/src/H5FDsec2.c
index 9c87161..a638381 100644
--- a/src/H5FDsec2.c
+++ b/src/H5FDsec2.c
@@ -428,7 +428,7 @@ H5FD_sec2_cmp(const H5FD_t *_f1, const H5FD_t *_f2)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_sec2_query(const H5FD_t UNUSED *_f, unsigned long *flags /* out */)
+H5FD_sec2_query(const H5FD_t * UNUSED _f, unsigned long *flags /* out */)
 {
     herr_t ret_value=SUCCEED;
 
diff --git a/src/H5FDstream.c b/src/H5FDstream.c
index b85e731..1c8be7f 100644
--- a/src/H5FDstream.c
+++ b/src/H5FDstream.c
@@ -935,7 +935,7 @@ static herr_t H5FD_stream_close (H5FD_t *_stream)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FD_stream_query(const H5FD_t UNUSED *_f,
+H5FD_stream_query(const H5FD_t * UNUSED _f,
                   unsigned long *flags/*out*/)
 {
     FUNC_ENTER (H5FD_stream_query, SUCCEED);
diff --git a/src/H5Fistore.c b/src/H5Fistore.c
index fc89a8d..c5f12a3 100644
--- a/src/H5Fistore.c
+++ b/src/H5Fistore.c
@@ -656,7 +656,7 @@ H5F_istore_new_node(H5F_t *f, H5B_ins_t op,
  */
 static herr_t
 H5F_istore_found(H5F_t UNUSED *f, haddr_t addr, const void *_lt_key,
-		 void *_udata, const void UNUSED *_rt_key)
+		 void *_udata, const void * UNUSED _rt_key)
 {
     H5F_istore_ud1_t	   *udata = (H5F_istore_ud1_t *) _udata;
     const H5F_istore_key_t *lt_key = (const H5F_istore_key_t *) _lt_key;
diff --git a/src/H5Gnode.c b/src/H5Gnode.c
index 6caff3f..9bcb91c 100644
--- a/src/H5Gnode.c
+++ b/src/H5Gnode.c
@@ -128,7 +128,7 @@ H5FL_BLK_DEFINE_STATIC(symbol_node);
  *-------------------------------------------------------------------------
  */
 static size_t
-H5G_node_sizeof_rkey(H5F_t *f, const void UNUSED *udata)
+H5G_node_sizeof_rkey(H5F_t *f, const void * UNUSED udata)
 {
     return H5F_SIZEOF_SIZE(f);	/*the name offset */
 }
@@ -411,8 +411,8 @@ H5G_node_flush(H5F_t *f, hbool_t destroy, haddr_t addr, H5G_node_t *sym)
  *-------------------------------------------------------------------------
  */
 static H5G_node_t *
-H5G_node_load(H5F_t *f, haddr_t addr, const void UNUSED *_udata1,
-	      void UNUSED *_udata2)
+H5G_node_load(H5F_t *f, haddr_t addr, const void * UNUSED _udata1,
+	      void * UNUSED _udata2)
 {
     H5G_node_t		   *sym = NULL;
     size_t		    size = 0;
@@ -625,8 +625,8 @@ H5G_node_cmp3(H5F_t *f, void *_lt_key, void *_udata, void *_rt_key)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5G_node_found(H5F_t *f, haddr_t addr, const void UNUSED *_lt_key,
-	       void *_udata, const void UNUSED *_rt_key)
+H5G_node_found(H5F_t *f, haddr_t addr, const void * UNUSED _lt_key,
+	       void *_udata, const void * UNUSED _rt_key)
 {
     H5G_bt_ud1_t	*bt_udata = (H5G_bt_ud1_t *) _udata;
     H5G_node_t		*sn = NULL;
diff --git a/src/H5HG.c b/src/H5HG.c
index f49aebd..b37c8fd 100644
--- a/src/H5HG.c
+++ b/src/H5HG.c
@@ -230,8 +230,8 @@ printf("%s: heap->obj[0].size=%d, size=%d\n",FUNC,(int)heap->obj[0].size,(int)si
  *-------------------------------------------------------------------------
  */
 static H5HG_heap_t *
-H5HG_load (H5F_t *f, haddr_t addr, const void UNUSED *udata1,
-	   void UNUSED *udata2)
+H5HG_load (H5F_t *f, haddr_t addr, const void * UNUSED udata1,
+	   void * UNUSED udata2)
 {
     H5HG_heap_t	*heap = NULL;
     H5HG_heap_t	*ret_value = NULL;
diff --git a/src/H5HL.c b/src/H5HL.c
index ac50afd..4e2591b 100644
--- a/src/H5HL.c
+++ b/src/H5HL.c
@@ -200,8 +200,8 @@ H5HL_create(H5F_t *f, size_t size_hint, haddr_t *addr_p/*out*/)
  *-------------------------------------------------------------------------
  */
 static H5HL_t *
-H5HL_load(H5F_t *f, haddr_t addr, const void UNUSED *udata1,
-	  void UNUSED *udata2)
+H5HL_load(H5F_t *f, haddr_t addr, const void * UNUSED udata1,
+	  void * UNUSED udata2)
 {
     uint8_t		hdr[52];
     const uint8_t	*p = NULL;
diff --git a/src/H5I.c b/src/H5I.c
index f759291..d6121c1 100644
--- a/src/H5I.c
+++ b/src/H5I.c
@@ -172,14 +172,14 @@ H5I_term_interface(void)
 
     if (interface_initialize_g) {
         /* How many groups are still being used? */
-        for (grp=(H5I_type_t)0; grp<H5I_NGROUPS; grp++) {
+        for (grp=(H5I_type_t)0; grp<H5I_NGROUPS; grp=grp+1) {
             if ((grp_ptr=H5I_id_group_list_g[grp]) && grp_ptr->id_list)
                 n++;
         }
 
         /* If no groups are used then clean  up */
         if (0==n) {
-            for (grp=(H5I_type_t)0; grp<H5I_NGROUPS; grp++) {
+            for (grp=(H5I_type_t)0; grp<H5I_NGROUPS; grp=grp+1) {
                 grp_ptr = H5I_id_group_list_g[grp];
                 H5MM_xfree(grp_ptr);
                 H5I_id_group_list_g[grp] = NULL;
diff --git a/src/H5O.c b/src/H5O.c
index 271de27..a4a3ed4 100644
--- a/src/H5O.c
+++ b/src/H5O.c
@@ -346,8 +346,8 @@ H5O_close(H5G_entry_t *obj_ent)
  *-------------------------------------------------------------------------
  */
 static H5O_t *
-H5O_load(H5F_t *f, haddr_t addr, const void UNUSED *_udata1,
-	 void UNUSED *_udata2)
+H5O_load(H5F_t *f, haddr_t addr, const void * UNUSED _udata1,
+	 void * UNUSED _udata2)
 {
     H5O_t	*oh = NULL;
     H5O_t	*ret_value = NULL;
diff --git a/src/H5Omtime.c b/src/H5Omtime.c
index b44dd98..ee19d56 100644
--- a/src/H5Omtime.c
+++ b/src/H5Omtime.c
@@ -280,7 +280,7 @@ H5O_mtime_copy(const void *_mesg, void *_dest)
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_mtime_size(H5F_t UNUSED *f, const void UNUSED *mesg)
+H5O_mtime_size(H5F_t * UNUSED f, const void * UNUSED mesg)
 {
     FUNC_ENTER(H5O_mtime_size, 0);
 
diff --git a/src/H5Oshared.c b/src/H5Oshared.c
index 1b8b423..01dd480 100644
--- a/src/H5Oshared.c
+++ b/src/H5Oshared.c
@@ -178,7 +178,7 @@ H5O_shared_encode (H5F_t *f, uint8_t *buf/*out*/, const void *_mesg)
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_shared_size (H5F_t *f, const void UNUSED *_mesg)
+H5O_shared_size (H5F_t *f, const void * UNUSED _mesg)
 {
     size_t	size;
     
diff --git a/src/H5Ostab.c b/src/H5Ostab.c
index cec6c6f..0a9d46b 100644
--- a/src/H5Ostab.c
+++ b/src/H5Ostab.c
@@ -233,7 +233,7 @@ H5O_stab_copy(const void *_mesg, void *_dest)
  *-------------------------------------------------------------------------
  */
 static size_t
-H5O_stab_size(H5F_t *f, const void UNUSED *_mesg)
+H5O_stab_size(H5F_t *f, const void * UNUSED _mesg)
 {
     FUNC_ENTER(H5O_stab_size, 0);
     FUNC_LEAVE(2 * H5F_SIZEOF_ADDR(f));
diff --git a/src/H5Sall.c b/src/H5Sall.c
index e0ad8b2..46ef817 100644
--- a/src/H5Sall.c
+++ b/src/H5Sall.c
@@ -115,7 +115,7 @@ H5S_all_init (const H5S_t *space, H5S_sel_iter_t *sel_iter)
  *-------------------------------------------------------------------------
  */
 static hsize_t
-H5S_all_favail (const H5S_t UNUSED *space, const H5S_sel_iter_t *sel_iter, hsize_t max)
+H5S_all_favail (const H5S_t * UNUSED space, const H5S_sel_iter_t *sel_iter, hsize_t max)
 {
     FUNC_ENTER (H5S_all_favail, 0);
 
@@ -702,7 +702,7 @@ fall_through:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_all_release (H5S_t UNUSED *space)
+H5S_all_release (H5S_t * UNUSED space)
 {
     FUNC_ENTER (H5S_all_release, FAIL);
 
@@ -810,7 +810,7 @@ H5S_all_select_serialize (const H5S_t *space, uint8_t *buf)
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_all_select_deserialize (H5S_t *space, const uint8_t UNUSED *buf)
+H5S_all_select_deserialize (H5S_t *space, const uint8_t * UNUSED buf)
 {
     herr_t ret_value=FAIL;  /* return value */
 
diff --git a/src/H5Shyper.c b/src/H5Shyper.c
index e150938..398e4b3 100644
--- a/src/H5Shyper.c
+++ b/src/H5Shyper.c
@@ -209,7 +209,7 @@ H5S_hyper_init (const H5S_t *space, H5S_sel_iter_t *sel_iter)
  *-------------------------------------------------------------------------
  */
 static hsize_t
-H5S_hyper_favail (const H5S_t UNUSED *space,
+H5S_hyper_favail (const H5S_t * UNUSED space,
 		  const H5S_sel_iter_t *sel_iter, hsize_t max)
 {
     FUNC_ENTER (H5S_hyper_favail, 0);
@@ -4760,7 +4760,7 @@ herr_t
 H5S_hyper_copy (H5S_t *dst, const H5S_t *src)
 {
     H5S_hyper_list_t *new_hyper=NULL;    /* New hyperslab selection */
-    H5S_hyper_node_t *curr, *new, *new_head;    /* Hyperslab information nodes */
+    H5S_hyper_node_t *curr, *new_node, *new_head;    /* Hyperslab information nodes */
     H5S_hyper_dim_t *new_diminfo=NULL;	/* New per-dimension info array[rank] */
     unsigned u;                    /* Counters */
     size_t v;                   /* Counters */
@@ -4842,33 +4842,33 @@ H5S_hyper_copy (H5S_t *dst, const H5S_t *src)
         printf("%s: check 5.1\n", FUNC);
 #endif /* QAK */
             /* Create each point */
-            if((new = H5FL_ALLOC(H5S_hyper_node_t,0))==NULL)
+            if((new_node = H5FL_ALLOC(H5S_hyper_node_t,0))==NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
                     "can't allocate point node");
-            HDmemcpy(new,curr,sizeof(H5S_hyper_node_t));    /* copy caching information */
-            if((new->start = H5FL_ARR_ALLOC(hsize_t,src->extent.u.simple.rank,0))==NULL)
+            HDmemcpy(new_node,curr,sizeof(H5S_hyper_node_t));    /* copy caching information */
+            if((new_node->start = H5FL_ARR_ALLOC(hsize_t,src->extent.u.simple.rank,0))==NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
                     "can't allocate coordinate information");
-            if((new->end = H5FL_ARR_ALLOC(hsize_t,src->extent.u.simple.rank,0))==NULL)
+            if((new_node->end = H5FL_ARR_ALLOC(hsize_t,src->extent.u.simple.rank,0))==NULL)
                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
                     "can't allocate coordinate information");
-            HDmemcpy(new->start,curr->start,(src->extent.u.simple.rank*sizeof(hssize_t)));
-            HDmemcpy(new->end,curr->end,(src->extent.u.simple.rank*sizeof(hssize_t)));
-            new->next=NULL;
+            HDmemcpy(new_node->start,curr->start,(src->extent.u.simple.rank*sizeof(hssize_t)));
+            HDmemcpy(new_node->end,curr->end,(src->extent.u.simple.rank*sizeof(hssize_t)));
+            new_node->next=NULL;
 
             /* Insert into low & high bound arrays */
             for(u=0; u<src->extent.u.simple.rank; u++) {
-                new_hyper->lo_bounds[u][v].bound=new->start[u];
-                new_hyper->lo_bounds[u][v].node=new;
+                new_hyper->lo_bounds[u][v].bound=new_node->start[u];
+                new_hyper->lo_bounds[u][v].node=new_node;
             } /* end for */
             v++;    /* Increment the location of the next node in the boundary arrays */
 
             /* Keep the order the same when copying */
             if(new_head==NULL)
-                new_head=new_hyper->head=new;
+                new_head=new_hyper->head=new_node;
             else {
-                new_head->next=new;
-                new_head=new;
+                new_head->next=new_node;
+                new_head=new_node;
             } /* end else */
 
             curr=curr->next;
@@ -6044,7 +6044,7 @@ H5S_hyper_select_iterate_mem (int dim, H5S_hyper_iter_info_t *iter_info)
  REVISION LOG
 --------------------------------------------------------------------------*/
 static herr_t
-H5S_hyper_select_iterate_mem_opt(H5S_sel_iter_t UNUSED *iter, void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op,
+H5S_hyper_select_iterate_mem_opt(H5S_sel_iter_t * UNUSED iter, void *buf, hid_t type_id, H5S_t *space, H5D_operator_t op,
         void *op_data)
 {
     H5S_hyper_dim_t *diminfo;               /* Alias for dataspace's diminfo information */
diff --git a/src/H5Snone.c b/src/H5Snone.c
index 553e3fd..c14c90d 100644
--- a/src/H5Snone.c
+++ b/src/H5Snone.c
@@ -85,7 +85,7 @@ H5S_none_select_serialize (const H5S_t *space, uint8_t *buf)
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_none_select_deserialize (H5S_t *space, const uint8_t UNUSED *buf)
+H5S_none_select_deserialize (H5S_t *space, const uint8_t * UNUSED buf)
 {
     herr_t ret_value=FAIL;  /* return value */
 
@@ -208,8 +208,8 @@ done:
  REVISION LOG
 --------------------------------------------------------------------------*/
 herr_t
-H5S_none_select_iterate(void UNUSED *buf, hid_t UNUSED type_id, H5S_t UNUSED *space, H5D_operator_t UNUSED op,
-        void UNUSED *operator_data)
+H5S_none_select_iterate(void * UNUSED buf, hid_t UNUSED type_id, H5S_t * UNUSED space, H5D_operator_t UNUSED op,
+        void * UNUSED operator_data)
 {
     herr_t ret_value=SUCCEED;      /* return value */
 
diff --git a/src/H5Spoint.c b/src/H5Spoint.c
index 119da32..9668233 100644
--- a/src/H5Spoint.c
+++ b/src/H5Spoint.c
@@ -127,7 +127,7 @@ H5S_point_init (const H5S_t *space, H5S_sel_iter_t *sel_iter)
 --------------------------------------------------------------------------*/
 herr_t H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hssize_t **_coord)
 {
-    H5S_pnt_node_t *top, *curr, *new; /* Point selection nodes */
+    H5S_pnt_node_t *top, *curr, *new_node; /* Point selection nodes */
     const hssize_t *coord=(const hssize_t *)_coord;     /* Pointer to the actual coordinates */
     unsigned i;                 /* Counter */
     herr_t ret_value=FAIL;  /* return value */
@@ -145,7 +145,7 @@ herr_t H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hss
     top=curr=NULL;
     for(i=0; i<num_elem; i++) {
         /* Allocate space for the new node */
-        if((new = H5MM_malloc(sizeof(H5S_pnt_node_t)))==NULL)
+        if((new_node = H5MM_malloc(sizeof(H5S_pnt_node_t)))==NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
                 "can't allocate point node");
 
@@ -153,7 +153,7 @@ herr_t H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hss
 	printf("%s: check 1.1, rank=%d\n",
 	       FUNC,(int)space->extent.u.simple.rank);
 #endif /* QAK */
-        if((new->pnt = H5MM_malloc(space->extent.u.simple.rank*sizeof(hssize_t)))==NULL)
+        if((new_node->pnt = H5MM_malloc(space->extent.u.simple.rank*sizeof(hssize_t)))==NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
                 "can't allocate coordinate information");
 #ifdef QAK
@@ -161,14 +161,14 @@ herr_t H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hss
 #endif /* QAK */
 
         /* Copy over the coordinates */
-        HDmemcpy(new->pnt,coord+(i*space->extent.u.simple.rank),(space->extent.u.simple.rank*sizeof(hssize_t)));
+        HDmemcpy(new_node->pnt,coord+(i*space->extent.u.simple.rank),(space->extent.u.simple.rank*sizeof(hssize_t)));
 #ifdef QAK
 	printf("%s: check 1.3\n",FUNC);
 	{
 	    int j;
 
 	    for(j=0; j<space->extent.u.simple.rank; j++) {
-		printf("%s: pnt[%d]=%d\n",FUNC,(int)j,(int)new->pnt[j]);
+		printf("%s: pnt[%d]=%d\n",FUNC,(int)j,(int)new_node->pnt[j]);
 		printf("%s: coord[%d][%d]=%d\n",
 		       FUNC, (int)i, (int)j,
 		       (int)*(coord+(i*space->extent.u.simple.rank)+j));
@@ -177,12 +177,12 @@ herr_t H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hss
 #endif /* QAK */
 
         /* Link into list */
-        new->next=NULL;
+        new_node->next=NULL;
         if(top==NULL)
-            top=new;
+            top=new_node;
         else
-            curr->next=new;
-        curr=new;
+            curr->next=new_node;
+        curr=new_node;
     } /* end for */
 #ifdef QAK
     printf("%s: check 2.0\n",FUNC);
@@ -198,13 +198,13 @@ herr_t H5S_point_add (H5S_t *space, H5S_seloper_t op, size_t num_elem, const hss
         space->select.sel_info.pnt_lst->head=top;
     }
     else {  /* op==H5S_SELECT_APPEND */
-        new=space->select.sel_info.pnt_lst->head;
-        if(new!=NULL)
-            while(new->next!=NULL)
-                new=new->next;
+        new_node=space->select.sel_info.pnt_lst->head;
+        if(new_node!=NULL)
+            while(new_node->next!=NULL)
+                new_node=new_node->next;
 
         /* Append new list to point selection */
-        new->next=top;
+        new_node->next=top;
     }
 
     /* Add the number of elements in the new selection */
@@ -234,7 +234,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static hsize_t
-H5S_point_favail (const H5S_t UNUSED *space,
+H5S_point_favail (const H5S_t * UNUSED space,
 		  const H5S_sel_iter_t *sel_iter, hsize_t max)
 {
     FUNC_ENTER (H5S_point_favail, 0);
@@ -728,7 +728,7 @@ H5S_point_npoints (const H5S_t *space)
 herr_t
 H5S_point_copy (H5S_t *dst, const H5S_t *src)
 {
-    H5S_pnt_node_t *curr, *new, *new_head;    /* Point information nodes */
+    H5S_pnt_node_t *curr, *new_node, *new_head;    /* Point information nodes */
     herr_t ret_value=SUCCEED;  /* return value */
 
     FUNC_ENTER (H5S_point_copy, FAIL);
@@ -748,30 +748,30 @@ H5S_point_copy (H5S_t *dst, const H5S_t *src)
     new_head=NULL;
     while(curr!=NULL) {
         /* Create each point */
-        if((new=H5MM_malloc(sizeof(H5S_pnt_node_t)))==NULL)
+        if((new_node=H5MM_malloc(sizeof(H5S_pnt_node_t)))==NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
                 "can't allocate point node");
-        if((new->pnt = H5MM_malloc(src->extent.u.simple.rank*sizeof(hssize_t)))==NULL)
+        if((new_node->pnt = H5MM_malloc(src->extent.u.simple.rank*sizeof(hssize_t)))==NULL)
             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL,
                 "can't allocate coordinate information");
-        HDmemcpy(new->pnt,curr->pnt,(src->extent.u.simple.rank*sizeof(hssize_t)));
-        new->next=NULL;
+        HDmemcpy(new_node->pnt,curr->pnt,(src->extent.u.simple.rank*sizeof(hssize_t)));
+        new_node->next=NULL;
 
 #ifdef QAK
  printf("%s: check 5.0\n",FUNC);
     {
         int i;
         for(i=0; i<src->extent.u.simple.rank; i++)
-            printf("%s: check 5.1, new->pnt[%d]=%d\n",FUNC,i,(int)new->pnt[i]);
+            printf("%s: check 5.1, new_node->pnt[%d]=%d\n",FUNC,i,(int)new_node->pnt[i]);
     }
 #endif /* QAK */
 
         /* Keep the order the same when copying */
         if(new_head==NULL)
-            new_head=dst->select.sel_info.pnt_lst->head=new;
+            new_head=dst->select.sel_info.pnt_lst->head=new_node;
         else {
-            new_head->next=new;
-            new_head=new;
+            new_head->next=new_node;
+            new_head=new_node;
         } /* end else */
 
         curr=curr->next;
diff --git a/src/H5T.c b/src/H5T.c
index 2b22e10..0cddf25 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1328,7 +1328,7 @@ H5T_init_interface(void)
  *-------------------------------------------------------------------------
  */
 static int
-H5T_unlock_cb (void *_dt, const void UNUSED *key)
+H5T_unlock_cb (void *_dt, const void * UNUSED key)
 {
     H5T_t	*dt = (H5T_t *)_dt;
     
@@ -6979,7 +6979,7 @@ done:
  */
 hid_t
 H5Tarray_create(hid_t base_id, int ndims, const hsize_t dim[/* ndims */],
-    const int UNUSED perm[/* ndims */])
+    const int * UNUSED perm/* ndims */)
 {
     H5T_t	*base = NULL;		/* base data type	*/
     H5T_t	*dt = NULL;		    /* new array data type	*/
@@ -7192,7 +7192,7 @@ H5Tget_array_dims(hid_t type_id, hsize_t dims[], int perm[])
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5T_print_stats(H5T_path_t UNUSED *path, int UNUSED *nprint/*in,out*/)
+H5T_print_stats(H5T_path_t * UNUSED path, int * UNUSED nprint/*in,out*/)
 {
 #ifdef H5T_DEBUG
     hsize_t	nbytes;