/[packages]/cauldron/HDF/current/SOURCES/HDF4.2r4-format_not_a_string_literal_and_no_format_arguments.diff
ViewVC logotype

Contents of /cauldron/HDF/current/SOURCES/HDF4.2r4-format_not_a_string_literal_and_no_format_arguments.diff

Parent Directory Parent Directory | Revision Log Revision Log

Revision 72538 - (show annotations) (download)
Wed Mar 16 13:11:09 2011 UTC (13 years, 1 month ago) by grenoya
File size: 18897 byte(s) 
imported package HDF
1 diff -Naurp HDF4.2r4/hdf/util/hdf2gif.c HDF4.2r4.oden/hdf/util/hdf2gif.c
2 --- HDF4.2r4/hdf/util/hdf2gif.c 2007-09-10 18:36:16.000000000 +0200
3 +++ HDF4.2r4.oden/hdf/util/hdf2gif.c 2009-08-17 13:49:59.000000000 +0200
4 @@ -143,7 +143,7 @@ int main(int argc , char **argv) {
5 if(file_id == -1) {
6 printf("Unable to open HDF file");
7 status = HEvalue(1);
8 - printf(HEstring(status));
9 + printf("%s", HEstring(status));
10 exit(0);
11 }
12
13 @@ -162,7 +162,7 @@ int main(int argc , char **argv) {
14
15 if ((status = GRfileinfo(gr_id , &n_images , &n_fileattributes)) == -1) {
16 status = HEvalue(1);
17 - printf(HEstring(status));
18 + printf("%s", HEstring(status));
19 exit(0);
20 }
21
22 diff -Naurp HDF4.2r4/hdf/util/writehdf.c HDF4.2r4.oden/hdf/util/writehdf.c
23 --- HDF4.2r4/hdf/util/writehdf.c 2007-09-10 18:36:16.000000000 +0200
24 +++ HDF4.2r4.oden/hdf/util/writehdf.c 2009-08-17 13:49:59.000000000 +0200
25 @@ -77,13 +77,13 @@ char *GIFFileName;
26 if(file_id == -1) {
27 printf("Unable to create HDF file");
28 status = HEvalue(1);
29 - printf(HEstring(status));
30 + printf("%s", HEstring(status));
31 exit(0);
32 }
33
34 if ((status = Vstart(file_id)) == -1) {
35 printf("Could not start VGroup interface\n");
36 - printf(HEstring(HEvalue(1)));
37 + printf("%s", HEstring(HEvalue(1)));
38 exit(-1);
39 }
40
41 @@ -99,7 +99,7 @@ char *GIFFileName;
42 status = Vsetattr (vgroup_id, "Global Palette" , DFNT_UINT8, 3 * gifHead.TableSize , (VOIDP)gifHead.HDFPalette);
43 if (status) {
44 printf("Could not add global palette.\n");
45 - printf(HEstring(HEvalue(1)));
46 + printf("%s", HEstring(HEvalue(1)));
47 }
48 }
49 for (i = 0 ; i < CommentCount ; i++) {
50 @@ -144,14 +144,14 @@ char *GIFFileName;
51 /* GRSetCompress */
52 if ((status = GRsetcompress(ri_id, comp_type, &c_info)) == -1) {
53 printf("Error occured while setting compression\n");
54 - printf(HEstring(HEvalue(1)));
55 + printf("%s", HEstring(HEvalue(1)));
56 exit(-1);
57 }
58
59 /* Write the GR Image */
60 if ((status = GRwriteimage(ri_id, start, NULL, edges, (VOIDP)gifImageDesc.Image)) == -1) {
61 printf("Error occured while trying to write GR image\n");
62 - printf(HEstring(HEvalue(1)));
63 + printf("%s", HEstring(HEvalue(1)));
64 exit(-1);
65 }
66
67 @@ -160,7 +160,7 @@ char *GIFFileName;
68
69 if ((status = GRwritelut (pal_id , 3, DFNT_UINT8, interlace_mode, 256, (VOIDP)gifImageDesc.HDFPalette)) == -1) {
70 printf("Could not write palette\n");
71 - printf(HEstring(HEvalue(1)));
72 + printf("%s", HEstring(HEvalue(1)));
73 exit(-1);
74 }
75
76 @@ -169,7 +169,7 @@ char *GIFFileName;
77
78 if ((status = GRendaccess(ri_id)) == -1) {
79 printf("Could not terminate GR access\n");
80 - printf(HEstring(HEvalue(1)));
81 + printf("%s", HEstring(HEvalue(1)));
82 exit(-1);
83 }
84
85 @@ -178,7 +178,7 @@ char *GIFFileName;
86 /* Adding GR to vgroup */
87 if((status = Vaddtagref(vgroup_id,(int32)1965,gr_ref))==-1) {
88 printf("Could not add tag to Vgroup");
89 - printf(HEstring(HEvalue(1)));
90 + printf("%s", HEstring(HEvalue(1)));
91 }
92
93
94 @@ -187,28 +187,28 @@ char *GIFFileName;
95 /* Terminate GR access */
96 if ((status = GRend (gr_id))==-1) {
97 printf("Could not end GR access\n");
98 - printf(HEstring(HEvalue(1)));
99 + printf("%s", HEstring(HEvalue(1)));
100 printf("Trying to continue (file may be corrupt)...\n");
101 }
102
103 /* Terminate access to the VGroup */
104 if ((status = Vdetach(vgroup_id))==-1) {
105 printf("Could not detach Vgroup\n");
106 - printf(HEstring(HEvalue(1)));
107 + printf("%s", HEstring(HEvalue(1)));
108 printf("Trying to continure (file may be corrupt)...\n");
109 }
110
111 /* Terminate access to the V interface */
112 if ((status = Vend(file_id))==-1) {
113 printf("Could not end VGroup access\n");
114 - printf(HEstring(HEvalue(1)));
115 + printf("%s", HEstring(HEvalue(1)));
116 printf("Trying to continure (file may be corrupt)... \n");
117 }
118
119 /* Close the HDF file */
120 if ((status = Hclose (file_id))==-1) {
121 printf("Could not close HDF file. Fatal Error");
122 - printf(HEstring(HEvalue(1)));
123 + printf("%s", HEstring(HEvalue(1)));
124 return(-1);
125 }
126 return(0);
127 diff -Naurp HDF4.2r4/mfhdf/hdfimport/hdfimport.c HDF4.2r4.oden/mfhdf/hdfimport/hdfimport.c
128 --- HDF4.2r4/mfhdf/hdfimport/hdfimport.c 2007-12-03 21:31:07.000000000 +0100
129 +++ HDF4.2r4.oden/mfhdf/hdfimport/hdfimport.c 2009-08-17 13:49:59.000000000 +0200
130 @@ -622,7 +622,7 @@ main(int argc, char *argv[])
131 break;
132 case ERR: /* command syntax error */
133 default:
134 - (void) fprintf(stderr, err2);
135 + (void) fprintf(stderr, "%s", err2);
136 usage(argv[0]);
137 goto err;
138 }
139 @@ -633,7 +633,7 @@ main(int argc, char *argv[])
140 */
141 if (!outfile_named)
142 {
143 - (void) fprintf(stderr, err3);
144 + (void) fprintf(stderr, "%s", err3);
145 usage(argv[0]);
146 goto err;
147 }
148 @@ -650,7 +650,7 @@ main(int argc, char *argv[])
149 return(0);
150
151 err:
152 - (void) fprintf(stderr, err4);
153 + (void) fprintf(stderr, "%s", err4);
154 return(1);
155 }
156
157 @@ -954,7 +954,7 @@ gdimen(struct infilesformat infile_info,
158 sds_name = (char *)HDmalloc(name_len+1);
159 if (sds_name == NULL)
160 {
161 - (void) fprintf(stderr, err6);
162 + (void) fprintf(stderr, "%s", err6);
163 goto err;
164 }
165
166 @@ -2221,7 +2221,7 @@ indexes(float32 *scale, int dim, int *id
167 */
168 if ((midpt = (float32 *) HDmalloc((size_t) dim * sizeof(float32))) == NULL)
169 {
170 - (void) fprintf(stderr, err1);
171 + (void) fprintf(stderr, "%s", err1);
172 goto err;
173 }
174 for (i = 0; i < dim - 1; i++)
175 @@ -2323,13 +2323,13 @@ interp(struct Input *in, struct Raster *
176 */
177 if ((hratio = (float32 *) HDmalloc((size_t) im->hres * sizeof(float32))) == NULL)
178 {
179 - (void) fprintf(stderr, err1);
180 + (void) fprintf(stderr, "%s", err1);
181 goto err;
182 }
183 if ((vratio = (float32 *) HDmalloc((unsigned int) im->vres *
184 sizeof(float32))) == NULL)
185 {
186 - (void) fprintf(stderr, err1);
187 + (void) fprintf(stderr, "%s", err1);
188 goto err;
189 }
190 if (in->rank == 3)
191 @@ -2337,7 +2337,7 @@ interp(struct Input *in, struct Raster *
192 if ((dratio = (float32 *) HDmalloc((unsigned int) im->dres *
193 sizeof(float32))) == NULL)
194 {
195 - (void) fprintf(stderr, err1);
196 + (void) fprintf(stderr, "%s", err1);
197 goto err;
198 }
199 }
200 @@ -2349,13 +2349,13 @@ interp(struct Input *in, struct Raster *
201 if ((hinc = (int *) HDmalloc((unsigned int) im->hres *
202 sizeof(int))) == NULL)
203 {
204 - (void) fprintf(stderr, err1);
205 + (void) fprintf(stderr, "%s", err1);
206 goto err;
207 }
208 if ((voff = (int *) HDmalloc((unsigned int) (im->vres + 1) *
209 sizeof(int))) == NULL)
210 {
211 - (void) fprintf(stderr, err1);
212 + (void) fprintf(stderr, "%s", err1);
213 goto err;
214 }
215 if (in->rank == 3)
216 @@ -2363,7 +2363,7 @@ interp(struct Input *in, struct Raster *
217 if ((doff = (int *) HDmalloc((unsigned int) (im->dres + 1) *
218 sizeof(int))) == NULL)
219 {
220 - (void) fprintf(stderr, err1);
221 + (void) fprintf(stderr, "%s", err1);
222 goto err;
223 }
224 }
225 @@ -2634,7 +2634,7 @@ palette(char *palfile)
226 */
227 if (DFR8setpalette(pal))
228 {
229 - (void) fprintf(stderr, err3);
230 + (void) fprintf(stderr, "%s", err3);
231 goto err;
232 }
233
234 @@ -2675,7 +2675,7 @@ pixrep(struct Input *in, struct Raster *
235 */
236 if ((hidx = (int *) HDmalloc((unsigned int) (im->hres + 1) * sizeof(int))) == NULL)
237 {
238 - (void) fprintf(stderr, err1);
239 + (void) fprintf(stderr, "%s", err1);
240 goto err;
241 }
242
243 @@ -2688,7 +2688,7 @@ pixrep(struct Input *in, struct Raster *
244 if ((vidx = (int *) HDmalloc((unsigned int) (im->vres + 1) *
245 sizeof(int))) == NULL)
246 {
247 - (void) fprintf(stderr, err1);
248 + (void) fprintf(stderr, "%s", err1);
249 goto err;
250 }
251
252 @@ -2705,7 +2705,7 @@ pixrep(struct Input *in, struct Raster *
253 if ((didx = (int *) HDmalloc((unsigned int) (im->dres + 1) *
254 sizeof(int))) == NULL)
255 {
256 - (void) fprintf(stderr, err1);
257 + (void) fprintf(stderr, "%s", err1);
258 goto err;
259 }
260
261 @@ -2719,7 +2719,7 @@ pixrep(struct Input *in, struct Raster *
262 if ((pix = (unsigned char *) HDmalloc((unsigned int) (in->dims[0] + 1))) ==
263 NULL)
264 {
265 - (void) fprintf(stderr, err1);
266 + (void) fprintf(stderr, "%s", err1);
267 goto err;
268 }
269 for (k = 0, odidx = didx[0] - 1; k < im->dres; k++)
270 @@ -2836,35 +2836,35 @@ alloc_data(VOIDP *data, int32 len, int o
271 case 5: /* NO_NE */
272 if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(float32))) == NULL)
273 {
274 - (void) fprintf(stderr, alloc_err);
275 + (void) fprintf(stderr, "%s", alloc_err);
276 return FAIL;
277 }
278 break;
279 case 1: /* 64-bit float */
280 if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(float64))) == NULL)
281 {
282 - (void) fprintf(stderr, alloc_err);
283 + (void) fprintf(stderr, "%s", alloc_err);
284 return FAIL;
285 }
286 break;
287 case 2: /* 32-bit integer */
288 if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int32))) == NULL)
289 {
290 - (void) fprintf(stderr, alloc_err);
291 + (void) fprintf(stderr, "%s", alloc_err);
292 return FAIL;
293 }
294 break;
295 case 3: /* 16-bit integer */
296 if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int16))) == NULL)
297 {
298 - (void) fprintf(stderr, alloc_err);
299 + (void) fprintf(stderr, "%s", alloc_err);
300 return FAIL;
301 }
302 break;
303 case 4: /* 8-bit integer */
304 if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int8))) == NULL)
305 {
306 - (void) fprintf(stderr, alloc_err);
307 + (void) fprintf(stderr, "%s", alloc_err);
308 return FAIL;
309 }
310 break;
311 @@ -2895,7 +2895,7 @@ write_SDS(int32 sds_id, struct Input *in
312 start[1] = 0;
313 if (SDwritedata(sds_id, start, NULL, edges, (VOIDP)in->data) != 0)
314 {
315 - (void) fprintf(stderr, write_err);
316 + (void) fprintf(stderr, "%s", write_err);
317 return FAIL;
318 }
319 }
320 @@ -2910,7 +2910,7 @@ write_SDS(int32 sds_id, struct Input *in
321 start[2] = 0;
322 if (SDwritedata(sds_id, start, NULL, edges, (VOIDP)in->data) != 0)
323 {
324 - (void) fprintf(stderr, write_err);
325 + (void) fprintf(stderr, "%s", write_err);
326 return FAIL;
327 }
328 }
329 @@ -3157,7 +3157,7 @@ process(struct Options *opt)
330 /* set range */
331 if (SDsetrange(sds_id, &in.max, &in.min)!=0)
332 {
333 - (void) fprintf(stderr, err5a);
334 + (void) fprintf(stderr, "%s", err5a);
335 goto err;
336 }
337
338 @@ -3185,7 +3185,7 @@ process(struct Options *opt)
339 /* set range */
340 if (SDsetrange(sds_id, &in.fp64s.max, &in.fp64s.min)!=0)
341 {
342 - (void) fprintf(stderr, err5a);
343 + (void) fprintf(stderr, "%s", err5a);
344 goto err;
345 }
346
347 @@ -3214,7 +3214,7 @@ process(struct Options *opt)
348 /* set range */
349 if (SDsetrange(sds_id, &in.in32s.max, &in.in32s.min)!=0)
350 {
351 - (void) fprintf(stderr, err5a);
352 + (void) fprintf(stderr, "%s", err5a);
353 goto err;
354 }
355
356 @@ -3242,7 +3242,7 @@ process(struct Options *opt)
357 /* set range */
358 if (SDsetrange(sds_id, &in.in16s.max, &in.in16s.min)!=0)
359 {
360 - (void) fprintf(stderr, err5a);
361 + (void) fprintf(stderr, "%s", err5a);
362 goto err;
363 }
364
365 @@ -3270,7 +3270,7 @@ process(struct Options *opt)
366 /* set range */
367 if (SDsetrange(sds_id, &in.in8s.max, &in.in8s.min)!=0)
368 {
369 - (void) fprintf(stderr, err5a);
370 + (void) fprintf(stderr, "%s", err5a);
371 goto err;
372 }
373
374 @@ -3290,7 +3290,7 @@ process(struct Options *opt)
375 /* close data set */
376 if (SDendaccess(sds_id) == FAIL )
377 {
378 - (void) fprintf(stderr, err6a);
379 + (void) fprintf(stderr, "%s", err6a);
380 goto err;
381 }
382
383 @@ -3316,7 +3316,7 @@ process(struct Options *opt)
384 im.hres = (opt->hres == 0) ? in.dims[0] : opt->hres;
385 if ((im.hres < in.dims[0]) && (opt->ctm == EXPAND))
386 {
387 - (void) fprintf(stderr, err3a);
388 + (void) fprintf(stderr, "%s", err3a);
389 (void) fprintf(stderr, err3b, "Horiz.");
390 (void) fprintf(stderr, err3c, "horiz.");
391 (void) fprintf(stderr, err3d, in.dims[0]);
392 @@ -3326,7 +3326,7 @@ process(struct Options *opt)
393 im.vres = (opt->vres == 0) ? in.dims[1] : opt->vres;
394 if ((im.vres < in.dims[1]) && (opt->ctm == EXPAND))
395 {
396 - (void) fprintf(stderr, err3a);
397 + (void) fprintf(stderr, "%s", err3a);
398 (void) fprintf(stderr, err3b, "Vert.");
399 (void) fprintf(stderr, err3c, "vert.");
400 (void) fprintf(stderr, err3d, in.dims[1]);
401 @@ -3341,7 +3341,7 @@ process(struct Options *opt)
402 if ((im.dres < in.dims[2]) &&
403 (opt->ctm == EXPAND))
404 {
405 - (void) fprintf(stderr, err3a);
406 + (void) fprintf(stderr, "%s", err3a);
407 (void) fprintf(stderr, err3b, "Depth");
408 (void) fprintf(stderr, err3c, "depth");
409 (void) fprintf(stderr, err3d,
410 @@ -3353,7 +3353,7 @@ process(struct Options *opt)
411 len = im.hres * im.vres * im.dres;
412 if ((im.image = (unsigned char *) HDmalloc((unsigned int) len)) == NULL)
413 {
414 - (void) fprintf(stderr, err2);
415 + (void) fprintf(stderr, "%s", err2);
416 goto err;
417 }
418
419 @@ -3383,7 +3383,7 @@ process(struct Options *opt)
420 if (DFR8addimage(opt->outfile, ip, im.hres,
421 im.vres, DFTAG_RLE))
422 {
423 - (void) fprintf(stderr, err4);
424 + (void) fprintf(stderr, "%s", err4);
425 goto err;
426 }
427 }
428 @@ -3424,7 +3424,7 @@ process(struct Options *opt)
429 /* close the output file */
430 if (SDend (sd_id) != 0)
431 {
432 - (void) fprintf(stderr, err6);
433 + (void) fprintf(stderr, "%s", err6);
434 goto err;
435 }
436
437 @@ -3513,13 +3513,13 @@ static int init_scales(struct Input * in
438 if ((in->hscale = (float32 *) HDmalloc((size_t)
439 (in->dims[0] + 1) * sizeof(float32))) == NULL)
440 {
441 - (void) fprintf(stderr, err1);
442 + (void) fprintf(stderr, "%s", err1);
443 goto err;
444 }
445 if ((in->vscale = (float32 *) HDmalloc((size_t)
446 (in->dims[1] + 1) * sizeof(float32))) == NULL)
447 {
448 - (void) fprintf(stderr, err1);
449 + (void) fprintf(stderr, "%s", err1);
450 goto err;
451 }
452 if (in->rank == 3)
453 @@ -3527,7 +3527,7 @@ static int init_scales(struct Input * in
454 if ((in->dscale = (float32 *) HDmalloc((size_t)
455 (in->dims[2] + 1) * sizeof(float32))) == NULL)
456 {
457 - (void) fprintf(stderr, err1);
458 + (void) fprintf(stderr, "%s", err1);
459 goto err;
460 }
461 }
462 @@ -3538,13 +3538,13 @@ static int init_scales(struct Input * in
463 if ((in->fp64s.hscale = (float64 *) HDmalloc((size_t)
464 (in->dims[0] + 1) * sizeof(float64))) == NULL)
465 {
466 - (void) fprintf(stderr, err1);
467 + (void) fprintf(stderr, "%s", err1);
468 goto err;
469 }
470 if ((in->fp64s.vscale = (float64 *) HDmalloc((size_t)
471 (in->dims[1] + 1) * sizeof(float64))) == NULL)
472 {
473 - (void) fprintf(stderr, err1);
474 + (void) fprintf(stderr, "%s", err1);
475 goto err;
476 }
477 if (in->rank == 3)
478 @@ -3552,7 +3552,7 @@ static int init_scales(struct Input * in
479 if ((in->fp64s.dscale = (float64 *) HDmalloc((size_t)
480 (in->dims[2] + 1) * sizeof(float64))) == NULL)
481 {
482 - (void) fprintf(stderr, err1);
483 + (void) fprintf(stderr, "%s", err1);
484 goto err;
485 }
486 }
487 @@ -3561,13 +3561,13 @@ static int init_scales(struct Input * in
488 if ((in->in32s.hscale = (int32 *) HDmalloc((size_t)
489 (in->dims[0] + 1) * sizeof(int32))) == NULL)
490 {
491 - (void) fprintf(stderr, err1);
492 + (void) fprintf(stderr, "%s", err1);
493 goto err;
494 }
495 if ((in->in32s.vscale = (int32 *) HDmalloc((size_t)
496 (in->dims[1] + 1) * sizeof(int32))) == NULL)
497 {
498 - (void) fprintf(stderr, err1);
499 + (void) fprintf(stderr, "%s", err1);
500 goto err;
501 }
502 if (in->rank == 3)
503 @@ -3575,7 +3575,7 @@ static int init_scales(struct Input * in
504 if ((in->in32s.dscale = (int32 *) HDmalloc((size_t)
505 (in->dims[2] + 1) * sizeof(int32))) == NULL)
506 {
507 - (void) fprintf(stderr, err1);
508 + (void) fprintf(stderr, "%s", err1);
509 goto err;
510 }
511 }
512 @@ -3585,13 +3585,13 @@ static int init_scales(struct Input * in
513 if ((in->in16s.hscale = (int16 *) HDmalloc((size_t)
514 (in->dims[0] + 1) * sizeof(int16))) == NULL)
515 {
516 - (void) fprintf(stderr, err1);
517 + (void) fprintf(stderr, "%s", err1);
518 goto err;
519 }
520 if ((in->in16s.vscale = (int16 *) HDmalloc((size_t)
521 (in->dims[1] + 1) * sizeof(int16))) == NULL)
522 {
523 - (void) fprintf(stderr, err1);
524 + (void) fprintf(stderr, "%s", err1);
525 goto err;
526 }
527 if (in->rank == 3)
528 @@ -3599,7 +3599,7 @@ static int init_scales(struct Input * in
529 if ((in->in16s.dscale = (int16 *) HDmalloc((size_t)
530 (in->dims[2] + 1) * sizeof(int16))) == NULL)
531 {
532 - (void) fprintf(stderr, err1);
533 + (void) fprintf(stderr, "%s", err1);
534 goto err;
535 }
536 }
537 @@ -3609,13 +3609,13 @@ static int init_scales(struct Input * in
538 if ((in->in8s.hscale = (int8 *) HDmalloc((size_t)
539 (in->dims[0] + 1) * sizeof(int8))) == NULL)
540 {
541 - (void) fprintf(stderr, err1);
542 + (void) fprintf(stderr, "%s", err1);
543 goto err;
544 }
545 if ((in->in8s.vscale = (int8 *) HDmalloc((size_t)
546 (in->dims[1] + 1) * sizeof(int8))) == NULL)
547 {
548 - (void) fprintf(stderr, err1);
549 + (void) fprintf(stderr, "%s", err1);
550 goto err;
551 }
552 if (in->rank == 3)
553 @@ -3623,7 +3623,7 @@ static int init_scales(struct Input * in
554 if ((in->in8s.dscale = (int8 *) HDmalloc((size_t)
555 (in->dims[2] + 1) * sizeof(int8))) == NULL)
556 {
557 - (void) fprintf(stderr, err1);
558 + (void) fprintf(stderr, "%s", err1);
559 goto err;
560 }
561 }
  ViewVC Help
Powered by ViewVC 1.1.30