--- tools/h5import/h5import.c.orig	2010-06-04 16:24:21.000000000 +0200
+++ tools/h5import/h5import.c	2010-08-13 14:50:05.000000000 +0200
@@ -64,7 +64,7 @@
 
   if (argc < 2)
   {
-    (void) fprintf(stderr, err1, argc);
+    (void) fprintf(stderr, "%s", err1, argc);
     usage(argv[0]);
     goto err;
   }
@@ -98,7 +98,7 @@
 	        opt.fcount++;
 				}
 				else {
-					(void) fprintf(stderr, err9, argv[i]);
+					(void) fprintf(stderr, "%s", err9, argv[i]);
 					goto err;
 				}
 
@@ -131,7 +131,7 @@
       case 8:    /* read dimensions */
 	if (parseDimensions(in, argv[i]) == -1)
         {
-          (void) fprintf(stderr, err6, argv[i]);
+          (void) fprintf(stderr, "%s", err6, argv[i]);
 					goto err;
         }
       break;
@@ -142,7 +142,7 @@
       case 10:    /* read path name */
  	if (parsePathInfo(&in->path, argv[i]) == -1)
         {
-          (void) fprintf(stderr, err5, argv[i]);
+          (void) fprintf(stderr, "%s", err5, argv[i]);
 					goto err;
         }
       break;
@@ -153,7 +153,7 @@
       case 12:    /* read data type */
         if (getInputClass(in, argv[i]) == -1)
         {
-          (void) fprintf(stderr, err7, argv[i]);
+          (void) fprintf(stderr, "%s", err7, argv[i]);
 					goto err;
         }
 
@@ -171,7 +171,7 @@
       case 14:    /* read data size */
         if (getInputSize(in, (int)HDstrtol(argv[i], NULL, BASE_10)) == -1)
         {
-          (void) fprintf(stderr, err8, argv[i]);
+          (void) fprintf(stderr, "%s", err8, argv[i]);
 					goto err;
         }
         /*set default value for output-size */
@@ -256,7 +256,7 @@
     }
 
     if (token == ERR)
-      (void) fprintf(stderr, err1, s);
+      (void) fprintf(stderr, "%s", err1, s);
   }
   else    /* filename */
   {
@@ -313,14 +313,14 @@
 
       if ((*strm = fopen(infile, "rb")) == NULL)
       {
-          (void) fprintf(stderr, err1, infile);
+          (void) fprintf(stderr, "%s", err1, infile);
           return(-1);
       }
 #else
 
       if ((*strm = fopen(infile, "r")) == NULL)
       {
-          (void) fprintf(stderr, err1, infile);
+          (void) fprintf(stderr, "%s", err1, infile);
           return(-1);
       }
 
@@ -335,7 +335,7 @@
   {
       if ((*strm = fopen(infile, "r")) == NULL)
       {
-          (void) fprintf(stderr, err1, infile);
+          (void) fprintf(stderr, "%s", err1, infile);
           return(-1);
       }
   }
@@ -348,13 +348,13 @@
     case 4: /*  IN  */
       if (allocateIntegerStorage(in) == -1)
       {
-        (void) fprintf(stderr, err2, infile);
+        (void) fprintf(stderr, "%s", err2, infile);
         return(-1);
       }
 
       if (readIntegerData(strm, in) == -1)
       {
-        (void) fprintf(stderr, err4, infile);
+        (void) fprintf(stderr, "%s", err4, infile);
         return(-1);
       }
     break;
@@ -364,14 +364,14 @@
     case 3: /*  FP  */
       if (allocateFloatStorage(in) == -1)
       {
-        (void) fprintf(stderr, err3, infile);
+        (void) fprintf(stderr, "%s", err3, infile);
         return(-1);
 
       }
 
       if (readFloatData(strm, in) == -1)
       {
-        (void) fprintf(stderr, err5, infile);
+        (void) fprintf(stderr, "%s", err5, infile);
           return(-1);
       }
     break;
@@ -380,7 +380,7 @@
 
         if (processStrData(strm, in, file_id) == -1)
         {
-            (void) fprintf(stderr, err11, infile);
+            (void) fprintf(stderr, "%s", err11, infile);
             return(-1);
         }
 
@@ -392,12 +392,12 @@
     case 7: /* UIN */
       if (allocateUIntegerStorage(in) == -1)
       {
-        (void) fprintf(stderr, err6, infile);
+        (void) fprintf(stderr, "%s", err6, infile);
           return(-1);
       }
       if (readUIntegerData(strm, in) == -1)
       {
-        (void) fprintf(stderr, err7, infile);
+        (void) fprintf(stderr, "%s", err7, infile);
          return(-1);
       }
     break;
@@ -1201,7 +1201,7 @@
 
   if ((*strm = fopen(infile, "r")) == NULL)
   {
-    (void) fprintf(stderr, err1, infile);
+    (void) fprintf(stderr, "%s", err1, infile);
     return (-1);
   }
 
@@ -1209,7 +1209,7 @@
   {
     if ((kindex = mapKeywordToIndex(key)) == -1)
     {
-      (void) fprintf(stderr, err2, infile);
+      (void) fprintf(stderr, "%s", err2, infile);
       return (-1);
     }
     switch (kindex)
@@ -1217,7 +1217,7 @@
       case 0: /* PATH */
         if (in->configOptionVector[PATH] == 1)
         {
-          (void) fprintf(stderr, err3a, infile);
+          (void) fprintf(stderr, "%s", err3a, infile);
           return (-1);
         }
 	if (fscanf(*strm, "%s", temp) != 1)
@@ -1227,7 +1227,7 @@
 	}
         if (parsePathInfo(&in->path, temp) == -1)
         {
-          (void) fprintf(stderr, err3b, infile);
+          (void) fprintf(stderr, "%s", err3b, infile);
           return (-1);
         }
         in->configOptionVector[PATH] = 1;
@@ -1236,7 +1236,7 @@
       case 1: /* INPUT-CLASS */
         if (in->configOptionVector[INPUT_CLASS] == 1)
         {
-          (void) fprintf(stderr, err4a, infile);
+          (void) fprintf(stderr, "%s", err4a, infile);
           return (-1);
         }
 
@@ -1247,7 +1247,7 @@
 	}
         if (getInputClass(in, temp) == -1)
         {
-          (void) fprintf(stderr, err4b, infile);
+          (void) fprintf(stderr, "%s", err4b, infile);
           return (-1);
         }
 
@@ -1268,7 +1268,7 @@
       case 2: /* INPUT-SIZE */
         if (in->configOptionVector[INPUT_SIZE] == 1)
         {
-          (void) fprintf(stderr, err5a, infile);
+          (void) fprintf(stderr, "%s", err5a, infile);
           return (-1);
         }
 	if (fscanf(*strm, "%d", (&ival)) != 1)
@@ -1278,7 +1278,7 @@
 	}
         if (getInputSize(in, ival) == -1)
         {
-          (void) fprintf(stderr, err5b, infile);
+          (void) fprintf(stderr, "%s", err5b, infile);
           return (-1);
         }
         in->configOptionVector[INPUT_SIZE] = 1;
@@ -1291,13 +1291,13 @@
       case 3: /* RANK */
         if (in->configOptionVector[RANK] == 1)
         {
-          (void) fprintf(stderr, err6a, infile);
+          (void) fprintf(stderr, "%s", err6a, infile);
           return (-1);
         }
 
         if (getRank(in, strm) == -1)
         {
-          (void) fprintf(stderr, err6b, infile);
+          (void) fprintf(stderr, "%s", err6b, infile);
           return (-1);
         }
         in->configOptionVector[RANK] = 1;
@@ -1306,18 +1306,18 @@
       case 4: /* DIMENSION-SIZES */
         if (in->configOptionVector[DIM] == 1)
         {
-          (void) fprintf(stderr, err7a, infile);
+          (void) fprintf(stderr, "%s", err7a, infile);
           return (-1);
         }
 
         if (in->configOptionVector[RANK] == 0)
         {
-          (void) fprintf(stderr, err7b, infile);
+          (void) fprintf(stderr, "%s", err7b, infile);
           return (-1);
         }
         if (getDimensionSizes(in, strm) == -1)
         {
-          (void) fprintf(stderr, err7c, infile);
+          (void) fprintf(stderr, "%s", err7c, infile);
           return (-1);
         }
         in->configOptionVector[DIM] = 1;
@@ -1326,13 +1326,13 @@
       case 5: /* OUTPUT-CLASS */
         if (in->configOptionVector[OUTPUT_CLASS] == 1)
         {
-          (void) fprintf(stderr, err8a, infile);
+          (void) fprintf(stderr, "%s", err8a, infile);
           return (-1);
         }
 
         if (getOutputClass(in, strm) == -1)
         {
-          (void) fprintf(stderr, err8b, infile);
+          (void) fprintf(stderr, "%s", err8b, infile);
           return (-1);
         }
         in->configOptionVector[OUTPUT_CLASS] = 1;
@@ -1341,13 +1341,13 @@
       case 6: /* OUTPUT-SIZE */
         if (in->configOptionVector[OUTPUT_SIZE] == 1)
         {
-          (void) fprintf(stderr, err9a, infile);
+          (void) fprintf(stderr, "%s", err9a, infile);
           return (-1);
         }
 
         if (getOutputSize(in, strm) == -1)
         {
-          (void) fprintf(stderr, err9b, infile);
+          (void) fprintf(stderr, "%s", err9b, infile);
           return (-1);
         }
         in->configOptionVector[OUTPUT_SIZE] = 1;
@@ -1356,13 +1356,13 @@
       case 7: /* OUTPUT-ARCHITECTURE */
         if (in->configOptionVector[OUTPUT_ARCH] == 1)
         {
-          (void) fprintf(stderr, err10a, infile);
+          (void) fprintf(stderr, "%s", err10a, infile);
           return (-1);
         }
 
         if (getOutputArchitecture(in, strm) == -1)
         {
-          (void) fprintf(stderr, err10b, infile);
+          (void) fprintf(stderr, "%s", err10b, infile);
           return (-1);
         }
         in->configOptionVector[OUTPUT_ARCH] = 1;
@@ -1371,13 +1371,13 @@
       case 8: /* OUTPUT-BYTE-ORDER */
         if (in->configOptionVector[OUTPUT_B_ORDER] == 1)
         {
-          (void) fprintf(stderr, err11a, infile);
+          (void) fprintf(stderr, "%s", err11a, infile);
           return (-1);
         }
 
         if (getOutputByteOrder(in, strm) == -1)
         {
-          (void) fprintf(stderr, err11b, infile);
+          (void) fprintf(stderr, "%s", err11b, infile);
           return (-1);
         }
         in->configOptionVector[OUTPUT_B_ORDER] = 1;
@@ -1386,19 +1386,19 @@
       case 9: /* CHUNKED-DIMENSION-SIZES */
         if (in->configOptionVector[CHUNK] == 1)
         {
-          (void) fprintf(stderr, err12a, infile);
+          (void) fprintf(stderr, "%s", err12a, infile);
           return (-1);
         }
         /* cant appear before dimension sizes have been provided */
         if (in->configOptionVector[DIM] == 0)
         {
-          (void) fprintf(stderr, err12b, infile);
+          (void) fprintf(stderr, "%s", err12b, infile);
           return (-1);
         }
 
         if (getChunkedDimensionSizes(in, strm) == -1)
         {
-          (void) fprintf(stderr, err12c, infile);
+          (void) fprintf(stderr, "%s", err12c, infile);
           return (-1);
         }
         in->configOptionVector[CHUNK] = 1;
@@ -1407,13 +1407,13 @@
       case 10: /* COMPRESSION-TYPE */
         if (in->configOptionVector[COMPRESS] == 1)
         {
-          (void) fprintf(stderr, err13a, infile);
+          (void) fprintf(stderr, "%s", err13a, infile);
           return (-1);
         }
 
         if (getCompressionType(in, strm) == -1)
         {
-          (void) fprintf(stderr, err13b, infile);
+          (void) fprintf(stderr, "%s", err13b, infile);
           return (-1);
         }
         in->configOptionVector[COMPRESS] = 1;
@@ -1428,13 +1428,13 @@
       case 11: /* COMPRESSION-PARAM */
         if (in->configOptionVector[COMPRESS_PARAM] == 1)
         {
-          (void) fprintf(stderr, err14a, infile);
+          (void) fprintf(stderr, "%s", err14a, infile);
           return (-1);
         }
 
         if (getCompressionParameter(in, strm) == -1)
         {
-          (void) fprintf(stderr, err14b, infile);
+          (void) fprintf(stderr, "%s", err14b, infile);
           return (-1);
         }
 
@@ -1449,13 +1449,13 @@
       case 12: /* EXTERNAL-STORAGE */
         if (in->configOptionVector[EXTERNAL] == 1)
         {
-          (void) fprintf(stderr, err15a, infile);
+          (void) fprintf(stderr, "%s", err15a, infile);
           return (-1);
         }
 
         if (getExternalFilename(in, strm) == -1)
         {
-          (void) fprintf(stderr, err15b, infile);
+          (void) fprintf(stderr, "%s", err15b, infile);
           return (-1);
         }
         in->configOptionVector[EXTERNAL] = 1;
@@ -1464,18 +1464,18 @@
       case 13: /* MAXIMUM-DIMENSIONS */
         if (in->configOptionVector[EXTEND] == 1)
         {
-          (void) fprintf(stderr, err16a, infile);
+          (void) fprintf(stderr, "%s", err16a, infile);
           return (-1);
         }
         /* cant appear before dimension sizes have been provided */
         if (in->configOptionVector[DIM] == 0)
         {
-          (void) fprintf(stderr, err16b, infile);
+          (void) fprintf(stderr, "%s", err16b, infile);
           return (-1);
         }
         if (getMaximumDimensionSizes(in, strm) == -1)
         {
-          (void) fprintf(stderr, err16c, infile);
+          (void) fprintf(stderr, "%s", err16c, infile);
           return (-1);
         }
         in->configOptionVector[EXTEND] = 1;
@@ -1492,7 +1492,7 @@
 
   if (validateConfigurationParameters(in) == -1)
   {
-    (void) fprintf(stderr, err17, infile);
+    (void) fprintf(stderr, "%s", err17, infile);
     return (-1);
   }
 
@@ -1600,7 +1600,7 @@
   token = HDstrtok (temp, delimiter);
   if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH)
   {
-    (void) fprintf(stderr, err1);
+    (void) fprintf(stderr, "%s", err1);
     return (-1);
   }
    HDstrcpy(path->group[i++],token);
@@ -1613,7 +1613,7 @@
       break;
     if (HDstrlen(token) >= MAX_PATH_NAME_LENGTH)
     {
-      (void) fprintf(stderr, err1);
+      (void) fprintf(stderr, "%s", err1);
       return (-1);
     }
     HDstrcpy(path->group[i++],token);
@@ -2497,7 +2497,7 @@
     if ((file_id = H5Fopen(opt->outfile, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) {
       if ((file_id = H5Fcreate(opt->outfile, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) == FAIL)
       {
-        (void) fprintf(stderr, err1, opt->outfile);
+        (void) fprintf(stderr, "%s", err1, opt->outfile);
         return (-1);
       }
     }
@@ -2510,14 +2510,14 @@
     {
     	if (processConfigurationFile(opt->infiles[k].configfile, in, &strm) == -1)
         {
-          (void) fprintf(stderr, err2, opt->infiles[k].configfile);
+          (void) fprintf(stderr, "%s", err2, opt->infiles[k].configfile);
           return (-1);
         }
     }
 
     if (processDataFile(opt->infiles[k].datafile, in, &strm, file_id ) == -1)
     {
-      (void) fprintf(stderr, err3, opt->infiles[k].datafile);
+      (void) fprintf(stderr, "%s", err3, opt->infiles[k].datafile);
       return (-1);
     }