128 lines
5.1 KiB
Diff
128 lines
5.1 KiB
Diff
diff -up ncl_ncarg-6.1.2/common/src/libncarg_c/options.c.format ncl_ncarg-6.1.2/common/src/libncarg_c/options.c
|
|
--- ncl_ncarg-6.1.2/common/src/libncarg_c/options.c.format 2013-02-06 20:27:58.000000000 -0700
|
|
+++ ncl_ncarg-6.1.2/common/src/libncarg_c/options.c 2014-01-31 22:43:55.271324335 -0700
|
|
@@ -869,7 +869,7 @@ void PrintOptionHelp(od, fp)
|
|
sprintf(sbf," arg0 .. arg%d",odr[i].arg_count-1);
|
|
(void) strcat(buf, sbf);
|
|
}
|
|
- (void) fprintf(fp, buf);
|
|
+ (void) fprintf(fp, "%s", buf);
|
|
for(j=strlen(buf); j<sizeof(buf); j++) {
|
|
putc(' ', fp);
|
|
}
|
|
diff -up ncl_ncarg-6.1.2/ncarg2d/src/bin/logos/ncarlogo2ps.c.format ncl_ncarg-6.1.2/ncarg2d/src/bin/logos/ncarlogo2ps.c
|
|
--- ncl_ncarg-6.1.2/ncarg2d/src/bin/logos/ncarlogo2ps.c.format 2013-02-06 20:27:05.000000000 -0700
|
|
+++ ncl_ncarg-6.1.2/ncarg2d/src/bin/logos/ncarlogo2ps.c 2014-01-31 22:16:00.868421438 -0700
|
|
@@ -310,9 +310,9 @@ void InsertLogo(float angle, float size,
|
|
sprintf(rotate,"%10.2f ", angle);
|
|
sprintf(rotate+11,"rotate\n");
|
|
|
|
- (void) fprintf(fp, translate);
|
|
- (void) fprintf(fp, scale);
|
|
- (void) fprintf(fp, rotate);
|
|
+ (void) fprintf(fp, "%s", translate);
|
|
+ (void) fprintf(fp, "%s", scale);
|
|
+ (void) fprintf(fp, "%s", rotate);
|
|
free(translate);
|
|
free(scale);
|
|
free(rotate);
|
|
diff -up ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/pdf.c.format ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/pdf.c
|
|
--- ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/pdf.c.format 2013-02-06 20:27:01.000000000 -0700
|
|
+++ ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/pdf.c 2014-02-01 09:01:41.672487008 -0700
|
|
@@ -398,10 +398,10 @@ void PDFpreamble (PDFddp *psa, preamble_
|
|
object_pointer[0] = byte_count;
|
|
|
|
strn = "%%PDF-1.4\n"; /* Double % prints as a single % */
|
|
- (void) fprintf(fp, strn); /* Double % prints as a single % */
|
|
+ (void) fprintf(fp, "%s", strn); /* Double % prints as a single % */
|
|
byte_count += 9; /* Double % prints as a single % */
|
|
strn = "%%\307\354\217\242\n";
|
|
- (void) fprintf(fp, strn);
|
|
+ (void) fprintf(fp, "%s", strn);
|
|
byte_count += 6;
|
|
|
|
object_number = 2;
|
|
@@ -1783,7 +1783,7 @@ int PDFCloseWorkstation(GKSC *gksc)
|
|
*/
|
|
object_pointer[1] = byte_count;
|
|
tstring = " 1 0 obj\n<<\n/Type /Pages\n/Kids [\n";
|
|
- fprintf(fp,tstring);
|
|
+ fprintf(fp,"%s",tstring);
|
|
byte_count += strlen(tstring);
|
|
|
|
for (i = 0; i < psa->page_number-1; i++) {
|
|
@@ -1795,7 +1795,7 @@ int PDFCloseWorkstation(GKSC *gksc)
|
|
byte_count += 16;
|
|
|
|
tstring = ">>\nendobj\n";
|
|
- fprintf(fp,tstring);
|
|
+ fprintf(fp,"%s",tstring);
|
|
byte_count += strlen(tstring);
|
|
|
|
/*
|
|
@@ -3645,7 +3645,7 @@ void PDFPutStream(FILE *fp) {
|
|
fprintf(fp, "%6d 0 obj\n<< /Length %10d >>\nstream\n",object_number+1,
|
|
stream_size);
|
|
for (i = 0; i < num_page_lines+1; i++) {
|
|
- fprintf(fp,page_lines[i]);
|
|
+ fprintf(fp, "%s",page_lines[i]);
|
|
fflush(fp);
|
|
}
|
|
fprintf(fp, "endstream\nendobj\n");
|
|
diff -up ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/ps.c.format ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/ps.c
|
|
--- ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/ps.c.format 2013-02-06 20:27:01.000000000 -0700
|
|
+++ ncl_ncarg-6.1.2/ncarg2d/src/libncarg_gks/cdrivers/ps.c 2014-01-31 22:45:29.039294483 -0700
|
|
@@ -3418,8 +3418,8 @@ void ps_NcarLogo(GKSC *gksc,float x,floa
|
|
scaling*(psa->dspace.urx), scaling*(psa->dspace.ury));
|
|
}
|
|
|
|
- (void) fprintf(fp, translate);
|
|
- (void) fprintf(fp, scale);
|
|
+ (void) fprintf(fp, "%s", translate);
|
|
+ (void) fprintf(fp, "%s", scale);
|
|
(void) fprintf(fp, "-40 33 translate\n");
|
|
(void) fprintf(fp, "1 -1 scale\n");
|
|
free(scale);
|
|
diff -up ncl_ncarg-6.1.2/ni/src/mkwrap/wrapit_main.c.format ncl_ncarg-6.1.2/ni/src/mkwrap/wrapit_main.c
|
|
--- ncl_ncarg-6.1.2/ni/src/mkwrap/wrapit_main.c.format 2013-02-06 20:28:03.000000000 -0700
|
|
+++ ncl_ncarg-6.1.2/ni/src/mkwrap/wrapit_main.c 2014-01-31 22:46:38.570497183 -0700
|
|
@@ -267,7 +267,7 @@ main(int argc,char* argv[])
|
|
char *type = "NclANY";
|
|
|
|
|
|
- fprintf(stdout,initial_fmt);
|
|
+ fprintf(stdout,"%s",initial_fmt);
|
|
if(!yyparse()) {
|
|
/*
|
|
tmp = wrap_list;
|
|
@@ -277,7 +277,7 @@ main(int argc,char* argv[])
|
|
|
|
}
|
|
*/
|
|
- fprintf(stdout,init_fmt);
|
|
+ fprintf(stdout,"%s",init_fmt);
|
|
tmp = wrap_list;
|
|
while(tmp!= NULL) {
|
|
fprintf(stdout,"\tnargs = 0;\n");
|
|
@@ -357,7 +357,7 @@ main(int argc,char* argv[])
|
|
}
|
|
tmp = tmp->next;
|
|
}
|
|
- fprintf(stdout,endf_fmt);
|
|
+ fprintf(stdout,"%s",endf_fmt);
|
|
exit(0);
|
|
} else {
|
|
fprintf(stdout,"Everything is NOT ok!\n");
|
|
diff -up ncl_ncarg-6.1.2/ni/src/ncl/NclGRIB.c.format ncl_ncarg-6.1.2/ni/src/ncl/NclGRIB.c
|
|
--- ncl_ncarg-6.1.2/ni/src/ncl/NclGRIB.c.format 2013-02-06 20:28:47.000000000 -0700
|
|
+++ ncl_ncarg-6.1.2/ni/src/ncl/NclGRIB.c 2014-01-31 22:16:00.870421500 -0700
|
|
@@ -2282,7 +2282,7 @@ GribFileRecord *therec;
|
|
if (cp && ! strcmp(cp,"_hours")) {
|
|
if ((NrmQuark)therec->options[GRIB_INITIAL_TIME_COORDINATE_TYPE_OPT].values == NrmStringToQuark("numeric"))
|
|
continue;
|
|
- sprintf(buffer,NrmQuarkToString(dimq));
|
|
+ sprintf(buffer,"%s",NrmQuarkToString(dimq));
|
|
cp = strrchr(buffer,'_');
|
|
*cp = '\0';
|
|
newdimq = NrmStringToQuark(buffer);
|