Skip to content

Commit 0f940eb

Browse files
sfomelsfomel
committed
cleanup
1 parent 5f2f4ad commit 0f940eb

File tree

5 files changed

+56
-57
lines changed

5 files changed

+56
-57
lines changed

‎api/c/files.c‎

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -230,30 +230,30 @@ off_t sf_shiftdim(sf_file in, sf_file out, int axis)
230230

231231
n3 = 1;
232232
for (j=axis; j < SF_MAX_DIM; j++) {
233-
sprintf(key2,"n%d",(j+1)%10u);
234-
sprintf(key1,"n%d",j);
233+
snprintf(key2,12,"n%d",(j+1)%10u);
234+
snprintf(key1,12,"n%d",j);
235235
if (!sf_histint(in,key1,&ni)) {
236236
sf_putint(out,key2,1);
237237
break;
238238
}
239239
sf_putint(out,key2,ni);
240240
n3 *= ni;
241241

242-
sprintf(key2,"o%d",(j+1)%10u);
243-
sprintf(key1,"o%d",j);
242+
snprintf(key2,12,"o%d",(j+1)%10u);
243+
snprintf(key1,12,"o%d",j);
244244
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
245245

246-
sprintf(key2,"d%d",(j+1)%10u);
247-
sprintf(key1,"d%d",j);
246+
snprintf(key2,12,"d%d",(j+1)%10u);
247+
snprintf(key1,12,"d%d",j);
248248
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
249249

250-
sprintf(key2,"label%d",(j+1)%10u);
251-
sprintf(key1,"label%d",j);
250+
snprintf(key2,12,"label%d",(j+1)%10u);
251+
snprintf(key1,12,"label%d",j);
252252
if (NULL != (val = sf_histstring(in,key1)))
253253
sf_putstring(out,key2,val);
254254

255-
sprintf(key2,"unit%d",(j+1)%10u);
256-
sprintf(key1,"unit%d",j);
255+
snprintf(key2,12,"unit%d",(j+1)%10u);
256+
snprintf(key1,12,"unit%d",j);
257257
if (NULL != (val = sf_histstring(in,key1)))
258258
sf_putstring(out,key2,val);
259259
}
@@ -271,30 +271,30 @@ off_t sf_shiftdim2(sf_file in, sf_file out, int axis)
271271

272272
n3 = 1;
273273
for (j=axis; j < SF_MAX_DIM; j++) {
274-
sprintf(key2,"n%d",(j+2)%100u);
275-
sprintf(key1,"n%d",j);
274+
snprintf(key2,7,"n%d",(j+2)%100u);
275+
snprintf(key1,7,"n%d",j);
276276
if (!sf_histint(in,key1,&ni)) {
277277
sf_putint(out,key2,1);
278278
break;
279279
}
280280
sf_putint(out,key2,ni);
281281
n3 *= ni;
282282

283-
sprintf(key2,"o%d",(j+2)%100u);
284-
sprintf(key1,"o%d",j);
283+
snprintf(key2,7,"o%d",(j+2)%100u);
284+
snprintf(key1,7,"o%d",j);
285285
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
286286

287-
sprintf(key2,"d%d",(j+2)%100u);
288-
sprintf(key1,"d%d",j);
287+
snprintf(key2,7,"d%d",(j+2)%100u);
288+
snprintf(key1,7,"d%d",j);
289289
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
290290

291-
sprintf(key2,"label%d",(j+2)%10u);
292-
sprintf(key1,"label%d",j);
291+
snprintf(key2,7,"label%d",(j+2)%10u);
292+
snprintf(key1,7,"label%d",j);
293293
if (NULL != (val = sf_histstring(in,key1)))
294294
sf_putstring(out,key2,val);
295295

296-
sprintf(key2,"unit%d",(j+2)%100u);
297-
sprintf(key1,"unit%d",j);
296+
snprintf(key2,7,"unit%d",(j+2)%100u);
297+
snprintf(key1,7,"unit%d",j);
298298
if (NULL != (val = sf_histstring(in,key1)))
299299
sf_putstring(out,key2,val);
300300
}
@@ -313,30 +313,30 @@ off_t sf_shiftdimn(sf_file in, sf_file out, int axis, int n)
313313
n3 = 1;
314314
for (j=axis; j < SF_MAX_DIM; j++) {
315315
if ((j+n) >= SF_MAX_DIM) sf_error ("Dimension shift is out of bounds");
316-
sprintf(key2,"n%d",j+n);
317-
sprintf(key1,"n%d",j);
316+
snprintf(key2,7,"n%d",j+n);
317+
snprintf(key1,7,"n%d",j);
318318
if (!sf_histint(in,key1,&ni)) {
319319
sf_putint(out,key2,1);
320320
break;
321321
}
322322
sf_putint(out,key2,ni);
323323
n3 *= ni;
324324

325-
sprintf(key2,"o%d",j+n);
326-
sprintf(key1,"o%d",j);
325+
snprintf(key2,7,"o%d",j+n);
326+
snprintf(key1,7,"o%d",j);
327327
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
328328

329-
sprintf(key2,"d%d",j+n);
330-
sprintf(key1,"d%d",j);
329+
snprintf(key2,7,"d%d",j+n);
330+
snprintf(key1,7,"d%d",j);
331331
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
332332

333-
sprintf(key2,"label%d",j+n);
334-
sprintf(key1,"label%d",j);
333+
snprintf(key2,7,"label%d",j+n);
334+
snprintf(key1,7,"label%d",j);
335335
if (NULL != (val = sf_histstring(in,key1)))
336336
sf_putstring(out,key2,val);
337337

338-
sprintf(key2,"unit%d",j+n);
339-
sprintf(key1,"unit%d",j);
338+
snprintf(key2,7,"unit%d",j+n);
339+
snprintf(key1,7,"unit%d",j);
340340
if (NULL != (val = sf_histstring(in,key1)))
341341
sf_putstring(out,key2,val);
342342
}
@@ -354,30 +354,30 @@ off_t sf_unshiftdim(sf_file in, sf_file out, int axis)
354354

355355
n3 = 1;
356356
for (j=axis; j < SF_MAX_DIM; j++) {
357-
sprintf(key2,"n%d",j);
358-
sprintf(key1,"n%d",(j+1)%10u);
357+
snprintf(key2,7,"n%d",j);
358+
snprintf(key1,7,"n%d",(j+1)%10u);
359359
if (!sf_histint(in,key1,&ni)) {
360360
sf_putint(out,key2,1);
361361
break;
362362
}
363363
sf_putint(out,key2,ni);
364364
n3 *= ni;
365365

366-
sprintf(key2,"o%d",j);
367-
sprintf(key1,"o%d",(j+1)%10u);
366+
snprintf(key2,7,"o%d",j);
367+
snprintf(key1,7,"o%d",(j+1)%10u);
368368
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
369369

370-
sprintf(key2,"d%d",j);
371-
sprintf(key1,"d%d",(j+1)%10u);
370+
snprintf(key2,7,"d%d",j);
371+
snprintf(key1,7,"d%d",(j+1)%10u);
372372
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
373373

374-
sprintf(key2,"label%d",j);
375-
sprintf(key1,"label%d",(j+1)%10u);
374+
snprintf(key2,7,"label%d",j);
375+
snprintf(key1,7,"label%d",(j+1)%10u);
376376
if (NULL != (val = sf_histstring(in,key1)))
377377
sf_putstring(out,key2,val);
378378

379-
sprintf(key2,"unit%d",j);
380-
sprintf(key1,"unit%d",(j+1)%10u);
379+
snprintf(key2,7,"unit%d",j);
380+
snprintf(key1,7,"unit%d",(j+1)%10u);
381381
if (NULL != (val = sf_histstring(in,key1)))
382382
sf_putstring(out,key2,val);
383383
}
@@ -395,8 +395,8 @@ off_t sf_unshiftdim2(sf_file in, sf_file out, int axis)
395395

396396
n3 = 1;
397397
for (j=axis; j < SF_MAX_DIM; j++) {
398-
sprintf(key2,"n%d",j);
399-
sprintf(key1,"n%d",(j+2)%10u);
398+
snprintf(key2,7,"n%d",j);
399+
snprintf(key1,7,"n%d",(j+2)%10u);
400400
if (!sf_histint(in,key1,&ni)) {
401401
sf_putint(out,key2,1);
402402
sprintf(key2,"n%d",(j+1)%10u);
@@ -406,21 +406,21 @@ off_t sf_unshiftdim2(sf_file in, sf_file out, int axis)
406406
sf_putint(out,key2,ni);
407407
n3 *= ni;
408408

409-
sprintf(key2,"o%d",j);
410-
sprintf(key1,"o%d",(j+2)%10u);
409+
snprintf(key2,7,"o%d",j);
410+
snprintf(key1,7,"o%d",(j+2)%10u);
411411
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
412412

413-
sprintf(key2,"d%d",j);
414-
sprintf(key1,"d%d",(j+2)%10u);
413+
snprintf(key2,7,"d%d",j);
414+
snprintf(key1,7,"d%d",(j+2)%10u);
415415
if (sf_histfloat(in,key1,&f)) sf_putfloat(out,key2,f);
416416

417-
sprintf(key2,"label%d",j);
418-
sprintf(key1,"label%d",(j+2)%10u);
417+
snprintf(key2,7,"label%d",j);
418+
snprintf(key1,7,"label%d",(j+2)%10u);
419419
if (NULL != (val = sf_histstring(in,key1)))
420420
sf_putstring(out,key2,val);
421421

422-
sprintf(key2,"unit%d",j);
423-
sprintf(key1,"unit%d",(j+2)%10u);
422+
snprintf(key2,7,"unit%d",j);
423+
snprintf(key1,7,"unit%d",(j+2)%10u);
424424
if (NULL != (val = sf_histstring(in,key1)))
425425
sf_putstring(out,key2,val);
426426
}
@@ -429,4 +429,3 @@ off_t sf_unshiftdim2(sf_file in, sf_file out, int axis)
429429
}
430430

431431

432-
/* $Id$ */

‎api/c/getpar.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void sf_init(int argc,char *argv[])
8888
tprog = strrchr(argv[0],'/');
8989
tprog = (NULL == tprog)? argv[0]:tprog+1;
9090
prog_len = strlen(tprog)+1;
91-
strncpy(prog,tprog,prog_len);
91+
memcpy(prog,tprog,prog_len);
9292

9393
/* no pars and input from terminal */
9494
if (1==argc && !sf_stdin()) {
@@ -109,7 +109,7 @@ void sf_init(int argc,char *argv[])
109109
if (NULL == pass) {
110110
user[0] = '\0';
111111
} else {
112-
strncpy(user,pass->pw_name,USERNAME_MAX);
112+
memcpy(user,pass->pw_name,USERNAME_MAX);
113113
}
114114
}
115115

‎pens/genlib/genmarker.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void genmarker (int npts, int type, int size, int *pvec)
5151
int savetxfont, savetxprec, savetxovly, savefat;
5252
struct s_txalign savealign;
5353
extern float fatmult_orig;
54-
char txbuf[12];
54+
char txbuf[20];
5555
char *txbuffer = txbuf;
5656

5757
savealign.hor = txalign.hor;
@@ -84,7 +84,7 @@ void genmarker (int npts, int type, int size, int *pvec)
8484
else
8585
if (type >= 127) /* special non-ASCII character */
8686
{
87-
sprintf (txbuffer, "\\v%d ", (int) type);
87+
snprintf (txbuffer, 20, "\\v%d ", (unsigned int) type);
8888
text_marker (txbuffer, size, npts, pvec);
8989
}
9090
else /* 0 through 5 are pre-defined; 6 through 20

‎pens/main/main_vplot.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ int main (int argc, char* argv[])
243243
len = strlen(string);
244244
pltinname[infileno] = sf_charalloc(len+1);
245245

246-
strncpy( pltinname[infileno],string,len);
246+
memcpy( pltinname[infileno],string,len);
247247

248248
infileno++;
249249
}

‎system/generic/predicates.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2596,7 +2596,7 @@ REAL incircleadapt(REAL *pa, REAL *pb, REAL *pc, REAL *pd, REAL permanent)
25962596
REAL cxtaa[8], cxtbb[8], cytaa[8], cytbb[8];
25972597
int cxtaalen, cxtbblen, cytaalen, cytbblen;
25982598
REAL axtbc[8], aytbc[8], bxtca[8], bytca[8], cxtab[8], cytab[8];
2599-
int axtbclen=0, aytbclen=0, bxtcalen, bytcalen=0, cxtablen=0, cytablen=0;
2599+
int axtbclen=0, aytbclen=0, bxtcalen=0, bytcalen=0, cxtablen=0, cytablen=0;
26002600
REAL axtbct[16], aytbct[16], bxtcat[16], bytcat[16], cxtabt[16], cytabt[16];
26012601
int axtbctlen, aytbctlen, bxtcatlen, bytcatlen, cxtabtlen, cytabtlen;
26022602
REAL axtbctt[8], aytbctt[8], bxtcatt[8];

0 commit comments

Comments
 (0)