This is an automated email from the git hooks/post-receive script. johanvdw-guest pushed a commit to branch master in repository hdf4.
commit a9b906fc956038d26eebe0c8036f4b2c46ee46d1 Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Fri Sep 5 23:57:07 2014 +0200 Fix String literals --- debian/patches/fix_string_literals.diff | 566 ++++++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 567 insertions(+) diff --git a/debian/patches/fix_string_literals.diff b/debian/patches/fix_string_literals.diff new file mode 100644 index 0000000..f9e05dd --- /dev/null +++ b/debian/patches/fix_string_literals.diff @@ -0,0 +1,566 @@ +Index: hdf4/hdf/util/hdf2gif.c +=================================================================== + +--- hdf4.orig/HDF4/hdf/util/hdf2gif.c ++++ hdf4/HDF4/hdf/util/hdf2gif.c +@@ -143,7 +143,7 @@ int main(int argc , char **argv) { + if(file_id == -1) { + printf("Unable to open HDF file"); + status = HEvalue(1); +- printf(HEstring(status)); ++ puts(HEstring(status)); + exit(0); + } + +@@ -162,7 +162,7 @@ int main(int argc , char **argv) { + + if ((status = GRfileinfo(gr_id , &n_images , &n_fileattributes)) == -1) { + status = HEvalue(1); +- printf(HEstring(status)); ++ puts(HEstring(status)); + exit(0); + } + +Index: hdf4/HDF4/hdf/util/writehdf.c +=================================================================== +--- hdf4.orig/HDF4/hdf/util/writehdf.c ++++ hdf4/hdf/HDF4/util/writehdf.c +@@ -77,13 +77,13 @@ char *GIFFileName; + if(file_id == -1) { + printf("Unable to create HDF file"); + status = HEvalue(1); +- printf(HEstring(status)); ++ puts(HEstring(status)); + exit(0); + } + + if ((status = Vstart(file_id)) == -1) { + printf("Could not start VGroup interface\n"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + exit(-1); + } + +@@ -99,7 +99,7 @@ char *GIFFileName; + status = Vsetattr (vgroup_id, "Global Palette" , DFNT_UINT8, 3 * gifHead.TableSize , (VOIDP)gifHead.HDFPalette); + if (status) { + printf("Could not add global palette.\n"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + } + } + for (i = 0 ; i < CommentCount ; i++) { +@@ -144,14 +144,14 @@ char *GIFFileName; + /* GRSetCompress */ + if ((status = GRsetcompress(ri_id, comp_type, &c_info)) == -1) { + printf("Error occured while setting compression\n"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + exit(-1); + } + + /* Write the GR Image */ + if ((status = GRwriteimage(ri_id, start, NULL, edges, (VOIDP)gifImageDesc.Image)) == -1) { + printf("Error occured while trying to write GR image\n"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + exit(-1); + } + +@@ -160,7 +160,7 @@ char *GIFFileName; + + if ((status = GRwritelut (pal_id , 3, DFNT_UINT8, interlace_mode, 256, (VOIDP)gifImageDesc.HDFPalette)) == -1) { + printf("Could not write palette\n"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + exit(-1); + } + +@@ -169,7 +169,7 @@ char *GIFFileName; + + if ((status = GRendaccess(ri_id)) == -1) { + printf("Could not terminate GR access\n"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + exit(-1); + } + +@@ -178,7 +178,7 @@ char *GIFFileName; + /* Adding GR to vgroup */ + if((status = Vaddtagref(vgroup_id,(int32)1965,gr_ref))==-1) { + printf("Could not add tag to Vgroup"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + } + + +@@ -187,28 +187,28 @@ char *GIFFileName; + /* Terminate GR access */ + if ((status = GRend (gr_id))==-1) { + printf("Could not end GR access\n"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + printf("Trying to continue (file may be corrupt)...\n"); + } + + /* Terminate access to the VGroup */ + if ((status = Vdetach(vgroup_id))==-1) { + printf("Could not detach Vgroup\n"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + printf("Trying to continure (file may be corrupt)...\n"); + } + + /* Terminate access to the V interface */ + if ((status = Vend(file_id))==-1) { + printf("Could not end VGroup access\n"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + printf("Trying to continure (file may be corrupt)... \n"); + } + + /* Close the HDF file */ + if ((status = Hclose (file_id))==-1) { + printf("Could not close HDF file. Fatal Error"); +- printf(HEstring(HEvalue(1))); ++ puts(HEstring(HEvalue(1))); + return(-1); + } + return(0); +Index: hdf4/HDF4/mfhdf/hdfimport/hdfimport.c +=================================================================== +--- hdf4.orig/HDF4/mfhdf/hdfimport/hdfimport.c ++++ hdf4/HDF4/mfhdf/hdfimport/hdfimport.c +@@ -624,7 +624,7 @@ main(int argc, char *argv[]) + break; + case ERR: /* command syntax error */ + default: +- (void) fprintf(stderr, err2); ++ (void) fputs(err2,stderr); + usage(argv[0]); + goto err; + } +@@ -635,7 +635,7 @@ main(int argc, char *argv[]) + */ + if (!outfile_named) + { +- (void) fprintf(stderr, err3); ++ (void) fputs(err3,stderr); + usage(argv[0]); + goto err; + } +@@ -652,7 +652,7 @@ main(int argc, char *argv[]) + return(0); + + err: +- (void) fprintf(stderr, err4); ++ (void) fputs(err4,stderr); + return(1); + } + +@@ -956,7 +956,7 @@ gdimen(struct infilesformat infile_info, + sds_name = (char *)HDmalloc(name_len+1); + if (sds_name == NULL) + { +- (void) fprintf(stderr, err6); ++ (void) fputs(err6,stderr); + goto err; + } + +@@ -2223,7 +2223,7 @@ indexes(float32 *scale, int dim, int *id + */ + if ((midpt = (float32 *) HDmalloc((size_t) dim * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + for (i = 0; i < dim - 1; i++) +@@ -2325,13 +2325,13 @@ interp(struct Input *in, struct Raster * + */ + if ((hratio = (float32 *) HDmalloc((size_t) im->hres * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if ((vratio = (float32 *) HDmalloc((unsigned int) im->vres * + sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if (in->rank == 3) +@@ -2339,7 +2339,7 @@ interp(struct Input *in, struct Raster * + if ((dratio = (float32 *) HDmalloc((unsigned int) im->dres * + sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + } +@@ -2351,13 +2351,13 @@ interp(struct Input *in, struct Raster * + if ((hinc = (int *) HDmalloc((unsigned int) im->hres * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if ((voff = (int *) HDmalloc((unsigned int) (im->vres + 1) * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if (in->rank == 3) +@@ -2365,7 +2365,7 @@ interp(struct Input *in, struct Raster * + if ((doff = (int *) HDmalloc((unsigned int) (im->dres + 1) * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + } +@@ -2636,7 +2636,7 @@ palette(char *palfile) + */ + if (DFR8setpalette(pal)) + { +- (void) fprintf(stderr, err3); ++ (void) fputs(err3, stderr); + goto err; + } + +@@ -2677,7 +2677,7 @@ pixrep(struct Input *in, struct Raster * + */ + if ((hidx = (int *) HDmalloc((unsigned int) (im->hres + 1) * sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + +@@ -2690,7 +2690,7 @@ pixrep(struct Input *in, struct Raster * + if ((vidx = (int *) HDmalloc((unsigned int) (im->vres + 1) * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + +@@ -2707,7 +2707,7 @@ pixrep(struct Input *in, struct Raster * + if ((didx = (int *) HDmalloc((unsigned int) (im->dres + 1) * + sizeof(int))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + +@@ -2721,7 +2721,7 @@ pixrep(struct Input *in, struct Raster * + if ((pix = (unsigned char *) HDmalloc((unsigned int) (in->dims[0] + 1))) == + NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + for (k = 0, odidx = didx[0] - 1; k < im->dres; k++) +@@ -2838,35 +2838,36 @@ alloc_data(VOIDP *data, int32 len, int o + case 5: /* NO_NE */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fputs(alloc_err, stderr); + return FAIL; + } + break; + case 1: /* 64-bit float */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(float64))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fputs(alloc_err, stderr); + return FAIL; + } + break; + case 2: /* 32-bit integer */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int32))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fputs(alloc_err, stderr); + return FAIL; + } + break; + case 3: /* 16-bit integer */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int16))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fputs(alloc_err, stderr); ++ return FAIL; + return FAIL; + } + break; + case 4: /* 8-bit integer */ + if ((*data = (VOIDP) HDmalloc((size_t) len * sizeof(int8))) == NULL) + { +- (void) fprintf(stderr, alloc_err); ++ (void) fputs(alloc_err, stderr); + return FAIL; + } + break; +@@ -2897,7 +2898,7 @@ write_SDS(int32 sds_id, struct Input *in + start[1] = 0; + if (SDwritedata(sds_id, start, NULL, edges, (VOIDP)in->data) != 0) + { +- (void) fprintf(stderr, write_err); ++ (void) fputs(write_err, stderr); + return FAIL; + } + } +@@ -2912,7 +2913,7 @@ write_SDS(int32 sds_id, struct Input *in + start[2] = 0; + if (SDwritedata(sds_id, start, NULL, edges, (VOIDP)in->data) != 0) + { +- (void) fprintf(stderr, write_err); ++ (void) fputs(write_err, stderr); + return FAIL; + } + } +@@ -3159,7 +3160,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.max, &in.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fputs(err5a, stderr); + goto err; + } + +@@ -3187,7 +3188,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.fp64s.max, &in.fp64s.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fputs(err5a, stderr); + goto err; + } + +@@ -3216,7 +3217,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.in32s.max, &in.in32s.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fputs(err5a, stderr); + goto err; + } + +@@ -3244,7 +3245,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.in16s.max, &in.in16s.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fputs(err5a, stderr); + goto err; + } + +@@ -3272,7 +3273,7 @@ process(struct Options *opt) + /* set range */ + if (SDsetrange(sds_id, &in.in8s.max, &in.in8s.min)!=0) + { +- (void) fprintf(stderr, err5a); ++ (void) fputs(err5a, stderr); + goto err; + } + +@@ -3292,7 +3293,7 @@ process(struct Options *opt) + /* close data set */ + if (SDendaccess(sds_id) == FAIL ) + { +- (void) fprintf(stderr, err6a); ++ (void) fputs(err6a, stderr); + goto err; + } + +@@ -3318,7 +3319,7 @@ process(struct Options *opt) + im.hres = (opt->hres == 0) ? in.dims[0] : opt->hres; + if ((im.hres < in.dims[0]) && (opt->ctm == EXPAND)) + { +- (void) fprintf(stderr, err3a); ++ (void) fputs(err3a, stderr); + (void) fprintf(stderr, err3b, "Horiz."); + (void) fprintf(stderr, err3c, "horiz."); + (void) fprintf(stderr, err3d, in.dims[0]); +@@ -3328,7 +3329,7 @@ process(struct Options *opt) + im.vres = (opt->vres == 0) ? in.dims[1] : opt->vres; + if ((im.vres < in.dims[1]) && (opt->ctm == EXPAND)) + { +- (void) fprintf(stderr, err3a); ++ (void) fputs(err3a, stderr); + (void) fprintf(stderr, err3b, "Vert."); + (void) fprintf(stderr, err3c, "vert."); + (void) fprintf(stderr, err3d, in.dims[1]); +@@ -3343,7 +3344,7 @@ process(struct Options *opt) + if ((im.dres < in.dims[2]) && + (opt->ctm == EXPAND)) + { +- (void) fprintf(stderr, err3a); ++ (void) fputs(err3a, stderr); + (void) fprintf(stderr, err3b, "Depth"); + (void) fprintf(stderr, err3c, "depth"); + (void) fprintf(stderr, err3d, +@@ -3355,7 +3356,7 @@ process(struct Options *opt) + len = im.hres * im.vres * im.dres; + if ((im.image = (unsigned char *) HDmalloc((unsigned int) len)) == NULL) + { +- (void) fprintf(stderr, err2); ++ (void) fputs(err2, stderr); + goto err; + } + +@@ -3385,7 +3386,7 @@ process(struct Options *opt) + if (DFR8addimage(opt->outfile, ip, im.hres, + im.vres, DFTAG_RLE)) + { +- (void) fprintf(stderr, err4); ++ (void) fputs(err4, stderr); + goto err; + } + } +@@ -3426,7 +3427,7 @@ process(struct Options *opt) + /* close the output file */ + if (SDend (sd_id) != 0) + { +- (void) fprintf(stderr, err6); ++ (void) fputs(err6, stderr); + goto err; + } + +@@ -3515,13 +3516,13 @@ static int init_scales(struct Input * in + if ((in->hscale = (float32 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if ((in->vscale = (float32 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if (in->rank == 3) +@@ -3529,7 +3530,7 @@ static int init_scales(struct Input * in + if ((in->dscale = (float32 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(float32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + } +@@ -3540,13 +3541,13 @@ static int init_scales(struct Input * in + if ((in->fp64s.hscale = (float64 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(float64))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if ((in->fp64s.vscale = (float64 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(float64))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if (in->rank == 3) +@@ -3554,7 +3555,7 @@ static int init_scales(struct Input * in + if ((in->fp64s.dscale = (float64 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(float64))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + } +@@ -3563,13 +3564,13 @@ static int init_scales(struct Input * in + if ((in->in32s.hscale = (int32 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(int32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if ((in->in32s.vscale = (int32 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(int32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if (in->rank == 3) +@@ -3577,7 +3578,7 @@ static int init_scales(struct Input * in + if ((in->in32s.dscale = (int32 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(int32))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + } +@@ -3587,13 +3588,13 @@ static int init_scales(struct Input * in + if ((in->in16s.hscale = (int16 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(int16))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if ((in->in16s.vscale = (int16 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(int16))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if (in->rank == 3) +@@ -3601,7 +3602,7 @@ static int init_scales(struct Input * in + if ((in->in16s.dscale = (int16 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(int16))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + } +@@ -3611,13 +3612,13 @@ static int init_scales(struct Input * in + if ((in->in8s.hscale = (int8 *) HDmalloc((size_t) + (in->dims[0] + 1) * sizeof(int8))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if ((in->in8s.vscale = (int8 *) HDmalloc((size_t) + (in->dims[1] + 1) * sizeof(int8))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + if (in->rank == 3) +@@ -3625,7 +3626,7 @@ static int init_scales(struct Input * in + if ((in->in8s.dscale = (int8 *) HDmalloc((size_t) + (in->dims[2] + 1) * sizeof(int8))) == NULL) + { +- (void) fprintf(stderr, err1); ++ (void) fputs(err1, stderr); + goto err; + } + } diff --git a/debian/patches/series b/debian/patches/series index 9edde4f..600238b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ kfreebsd ppc64el.diff install-examples.diff missing-includes.diff +fix_string_literals.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel