Skip to content

Commit 6116307

Browse files
SergeySliceSergeySlice
committed
reduce deprecations
Signed-off-by: Slice <[email protected]>
1 parent c0839cb commit 6116307

File tree

15 files changed

+60
-60
lines changed

15 files changed

+60
-60
lines changed

‎BaseTools/Source/C/Common/CommonLib.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -526,8 +526,8 @@ Routine Description:
526526
}
527527

528528
if (Uppercase) {
529-
sprintf (
530-
(CHAR8 *)Buffer,
529+
snprintf (
530+
(CHAR8 *)Buffer, PRINTED_GUID_BUFFER_SIZE,
531531
"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
532532
(unsigned) Guid->Data1,
533533
Guid->Data2,
@@ -542,8 +542,8 @@ Routine Description:
542542
Guid->Data4[7]
543543
);
544544
} else {
545-
sprintf (
546-
(CHAR8 *)Buffer,
545+
snprintf (
546+
(CHAR8 *)Buffer, PRINTED_GUID_BUFFER_SIZE,
547547
"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
548548
(unsigned) Guid->Data1,
549549
Guid->Data2,

‎BaseTools/Source/C/Common/EfiUtilityMsgs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ Routine Description:
459459
strcpy (Line, ": ");
460460
strncat (Line, Cptr, MAX_LINE_LEN - strlen (Line) - 1);
461461
if (LineNumber != 0) {
462-
sprintf (Line2, "(%u)", (unsigned) LineNumber);
462+
snprintf (Line2, MAX_LINE_LEN, "(%u)", (unsigned) LineNumber);
463463
strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
464464
}
465465
}
@@ -474,7 +474,7 @@ Routine Description:
474474
strncpy (Line, Cptr, MAX_LINE_LEN - 1);
475475
Line[MAX_LINE_LEN - 1] = 0;
476476
if (LineNumber != 0) {
477-
sprintf (Line2, "(%u)", (unsigned) LineNumber);
477+
snprintf (Line2, MAX_LINE_LEN, "(%u)", (unsigned) LineNumber);
478478
strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
479479
}
480480
} else {
@@ -501,7 +501,7 @@ Routine Description:
501501
strncat (Line, ": ", MAX_LINE_LEN - strlen (Line) - 1);
502502
strncat (Line, Type, MAX_LINE_LEN - strlen (Line) - 1);
503503
if (MessageCode != 0) {
504-
sprintf (Line2, " %04u", (unsigned) MessageCode);
504+
snprintf (Line2, MAX_LINE_LEN, " %04u", (unsigned) MessageCode);
505505
strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
506506
}
507507
fprintf (stdout, "%s", Line);

‎BaseTools/Source/C/Common/PcdValueCommon.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -257,16 +257,16 @@ Routine Description:
257257
}
258258
break;
259259
case PcdDataTypeUint8:
260-
sprintf(PcdList[Index].Value, "0x%02x", (UINT8)(Value & 0xff));
260+
snprintf(PcdList[Index].Value, 20, "0x%02x", (UINT8)(Value & 0xff));
261261
break;
262262
case PcdDataTypeUint16:
263-
sprintf(PcdList[Index].Value, "0x%04x", (UINT16)(Value & 0xffff));
263+
snprintf(PcdList[Index].Value, 20, "0x%04x", (UINT16)(Value & 0xffff));
264264
break;
265265
case PcdDataTypeUint32:
266-
sprintf(PcdList[Index].Value, "0x%08x", (UINT32)(Value & 0xffffffff));
266+
snprintf(PcdList[Index].Value, 20, "0x%08x", (UINT32)(Value & 0xffffffff));
267267
break;
268268
case PcdDataTypeUint64:
269-
sprintf(PcdList[Index].Value, "0x%016llx", (unsigned long long)Value);
269+
snprintf(PcdList[Index].Value, 20, "0x%016llx", (unsigned long long)Value);
270270
break;
271271
case PcdDataTypePointer:
272272
fprintf (stderr, "PCD %s.%s.%s.%s is structure. Use PcdSetPtr()\n", SkuName, DefaultValueName, TokenSpaceGuidName, TokenName);
@@ -392,7 +392,7 @@ Routine Description:
392392
PcdList[Index].Value = malloc(Size * 5 + 3);
393393
PcdList[Index].Value[0] = '{';
394394
for (ValueIndex = 0; ValueIndex < Size; ValueIndex++) {
395-
sprintf(&PcdList[Index].Value[1 + ValueIndex * 5], "0x%02x,", Value[ValueIndex]);
395+
snprintf(&PcdList[Index].Value[1 + ValueIndex * 5], 20, "0x%02x,", Value[ValueIndex]);
396396
}
397397
PcdList[Index].Value[1 + Size * 5 - 1] = '}';
398398
PcdList[Index].Value[1 + Size * 5 ] = 0;

‎BaseTools/Source/C/GenFfs/GenFfs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -819,13 +819,13 @@ Routine Description:
819819
goto Finish;
820820
}
821821
if (Alignment < 0x400){
822-
sprintf (AlignmentBuffer, "%d", Alignment);
822+
snprintf (AlignmentBuffer, sizeof(AlignmentBuffer), "%d", Alignment);
823823
}
824824
else if (Alignment >= 0x400) {
825825
if (Alignment >= 0x100000) {
826-
sprintf (AlignmentBuffer, "%dM", Alignment/0x100000);
826+
snprintf (AlignmentBuffer, sizeof(AlignmentBuffer),"%dM", Alignment/0x100000);
827827
} else {
828-
sprintf (AlignmentBuffer, "%dK", Alignment/0x400);
828+
snprintf (AlignmentBuffer, sizeof(AlignmentBuffer), "%dK", Alignment/0x400);
829829
}
830830
}
831831
Status = StringtoAlignment (AlignmentBuffer, &(InputFileAlign[InputFileNum]));

‎BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2302,8 +2302,8 @@ TokNode *p;
23022302
p->tclass->setnum = e;
23032303
p->tclass->setnumErrSet = eErrSet; /* MR23 */
23042304
}
2305-
sprintf(buf, "%s_set", TokenString(p->token));
2306-
sprintf(bufErrSet, "%s_errset", TokenString(p->token)); /* MR23 */
2305+
snprintf(buf, sizeof(buf), "%s_set", TokenString(p->token));
2306+
snprintf(bufErrSet, sizeof(bufErrSet), "%s_errset", TokenString(p->token)); /* MR23 */
23072307
set_name = buf;
23082308
set_nameErrSet = bufErrSet; /* MR23 */
23092309
}
@@ -2325,8 +2325,8 @@ TokNode *p;
23252325
p->tclass->setnumComplement = e;
23262326
p->tclass->setnumErrSetComplement = eErrSet; /* MR23 */
23272327
}
2328-
sprintf(buf, "%s_setbar", TokenString(p->token));
2329-
sprintf(bufErrSet, "%s_errsetbar", TokenString(p->token)); /* MR23 */
2328+
snprintf(buf, sizeof(buf), "%s_setbar", TokenString(p->token));
2329+
snprintf(bufErrSet, sizeof(bufErrSet), "%s_errsetbar", TokenString(p->token)); /* MR23 */
23302330
set_name = buf;
23312331
set_nameErrSet = bufErrSet; /* MR23 */
23322332
}
@@ -2335,10 +2335,10 @@ TokNode *p;
23352335
static char bufErrSet[sizeof("zzerr")+10];
23362336
int n = DefErrSet( &b, 0, NULL );
23372337
int nErrSet = DefErrSetWithSuffix(0, &bErrSet, 1, NULL, "_set");
2338-
if ( GenCC ) sprintf(buf, "err%d", n);
2339-
else sprintf(buf, "zzerr%d", n);
2340-
if ( GenCC ) sprintf(bufErrSet, "err%d", nErrSet);
2341-
else sprintf(bufErrSet, "zzerr%d", nErrSet);
2338+
if ( GenCC ) snprintf(buf, sizeof(buf), "err%d", n);
2339+
else snprintf(buf, sizeof(buf), "zzerr%d", n);
2340+
if ( GenCC ) snprintf(bufErrSet, sizeof(bufErrSet), "err%d", nErrSet);
2341+
else snprintf(bufErrSet, sizeof(bufErrSet), "zzerr%d", nErrSet);
23422342
set_name = buf;
23432343
set_nameErrSet = bufErrSet;
23442344
}
@@ -4365,9 +4365,9 @@ TokNode *p;
43654365
n = DefErrSet( &a, 0, NULL );
43664366
set_free(a);
43674367
if ( GenCC )
4368-
sprintf(buf, "err%d", n);
4368+
sprintf(buf, 100, "err%d", n);
43694369
else
4370-
sprintf(buf, "zzerr%d", n);
4370+
sprintf(buf, 100, "zzerr%d", n);
43714371
return buf;
43724372
}
43734373

‎BaseTools/Source/C/VfrCompile/Pccts/antlr/main.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,7 +1241,7 @@ int d;
12411241
{
12421242
static char buf[250]; /* DANGEROUS as hell !!!!!! */
12431243

1244-
sprintf(buf, s, d);
1244+
snprintf(buf, 250, s, d);
12451245
return( buf );
12461246
}
12471247

@@ -1257,7 +1257,7 @@ int d2;
12571257
{
12581258
static char buf[250]; /* DANGEROUS as hell !!!!!! */
12591259

1260-
sprintf(buf, s, d1, d2);
1260+
snprintf(buf, 250, s, d1, d2);
12611261
return( buf );
12621262
}
12631263

@@ -1306,7 +1306,7 @@ int token;
13061306
}
13071307

13081308
if (1) {
1309-
sprintf(imag_name,"UnknownToken#%d",token); /* MR13 */
1309+
sprintf(imag_name, 20, "UnknownToken#%d",token); /* MR13 */
13101310
return imag_name; /* MR13 */
13111311
}
13121312

@@ -1720,7 +1720,7 @@ char *name;
17201720
{
17211721
static char buf[100];
17221722
char *p;
1723-
sprintf(buf, "%s", name);
1723+
snprintf(buf, 100, "%s", name);
17241724

17251725
for (p=buf; *p!='\0'; p++)
17261726
{
@@ -1740,7 +1740,7 @@ int altnum;
17401740
{
17411741
static char buf[100];
17421742
char *p;
1743-
sprintf(buf, "_blk%d_alt%d", blockid, altnum);
1743+
snprintf(buf, 100, "_blk%d_alt%d", blockid, altnum);
17441744
p = (char *)malloc(strlen(buf)+1);
17451745
strcpy(p, buf);
17461746
return p;

‎BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,9 +2215,9 @@ char * MR_ruleNamePlusOffset(n)
22152215

22162216
strncpy(ruleNameStatic1,n->rname,ruleNameMax);
22172217
if (offset < 0) {
2218-
sprintf(ruleNameStatic2,"%s/?",ruleNameStatic1);
2218+
snprintf(ruleNameStatic2, sizeof(ruleNameStatic2), "%s/?",ruleNameStatic1);
22192219
} else {
2220-
sprintf(ruleNameStatic2,"%s/%d",ruleNameStatic1,offset+1);
2220+
snprintf(ruleNameStatic2, sizeof(ruleNameStatic2), "%s/%d",ruleNameStatic1,offset+1);
22212221
};
22222222
return ruleNameStatic2;
22232223
}

‎BaseTools/Source/C/VfrCompile/Pccts/antlr/scan.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1285,9 +1285,9 @@ static void act113()
12851285
if ( strlen(zzbegexpr)>(size_t)85 )
12861286
fatal("$i attrib ref too big");
12871287
set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
1288-
if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s)",
1288+
if ( !GenCC ) snprintf(buf, 100, "zzaArg(zztasp%d,%s)",
12891289
BlkLevel-1,zzbegexpr+1);
1290-
else sprintf(buf,"_t%d%s",
1290+
else snprintf(buf, 100, "_t%d%s",
12911291
BlkLevel-1,zzbegexpr+1);
12921292
zzreplstr(buf);
12931293
zzmore();
@@ -1308,9 +1308,9 @@ static void act114()
13081308
fatal("$i.field attrib ref too big");
13091309
zzbegexpr[strlen(zzbegexpr)-1] = ' ';
13101310
set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
1311-
if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s).",
1311+
if ( !GenCC ) snprintf(buf, 100, "zzaArg(zztasp%d,%s).",
13121312
BlkLevel-1,zzbegexpr+1);
1313-
else sprintf(buf,"_t%d%s.",
1313+
else snprintf(buf, 100, "_t%d%s.",
13141314
BlkLevel-1,zzbegexpr+1);
13151315
zzreplstr(buf);
13161316
zzmore();
@@ -1344,8 +1344,8 @@ static void act115()
13441344
*q++ = *p;
13451345
}
13461346
*q = '\0';
1347-
if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%s,%s)",i,j);
1348-
else sprintf(buf,"_t%s%s",i,j);
1347+
if ( !GenCC ) snprintf(buf, sizeof(buf), "zzaArg(zztasp%s,%s)",i,j);
1348+
else snprintf(buf, sizeof(buf), "_t%s%s",i,j);
13491349
zzreplstr(buf);
13501350
zzmore();
13511351
UsedOldStyleAttrib = 1;
@@ -1369,7 +1369,7 @@ static void act116()
13691369
if ( hasMultipleOperands( CurRetDef ) ) {
13701370
require (strlen(zzbegexpr)<=(size_t)285,
13711371
"$retval attrib ref too big");
1372-
sprintf(buf,"_retv.%s",&zzbegexpr[1]);
1372+
snprintf(buf, sizeof(buf), "_retv.%s",&zzbegexpr[1]);
13731373
zzreplstr(buf);
13741374
}
13751375
else zzreplstr("_retv");
@@ -1439,8 +1439,8 @@ static void act120()
14391439
static char buf[100];
14401440
if ( strlen(zzbegexpr)>(size_t)85 )
14411441
fatal("#i AST ref too big");
1442-
if ( GenCC ) sprintf(buf,"_ast%d%s",BlkLevel-1,zzbegexpr+1);
1443-
else sprintf(buf,"zzastArg(%s)",zzbegexpr+1);
1442+
if ( GenCC ) snprintf(buf, sizeof(buf), "_ast%d%s",BlkLevel-1,zzbegexpr+1);
1443+
else snprintf(buf, sizeof(buf), "zzastArg(%s)",zzbegexpr+1);
14441444
zzreplstr(buf);
14451445
zzmore();
14461446
set_orel(atoi(zzbegexpr+1), &AST_nodes_refd_in_actions);
@@ -1484,7 +1484,7 @@ static void act123()
14841484
strcmp(zzbegexpr, "#error")==0) )
14851485
{
14861486
static char buf[100];
1487-
sprintf(buf, "%s_ast", zzbegexpr+1);
1487+
snprintf(buf, sizeof(buf), "%s_ast", zzbegexpr+1);
14881488
/* MR27 */ list_add(&CurAstLabelsInActions, mystrdup(zzbegexpr+1));
14891489
zzreplstr(buf);
14901490
chkGTFlag();

‎BaseTools/Source/C/VfrCompile/Pccts/dlg/output.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ char *name;
122122
#endif
123123
{
124124
static char buf[100];
125-
sprintf(buf, "%s_h", name);
125+
snprintf(buf, sizeof(buf), "%s_h", name);
126126
return buf;
127127
}
128128

@@ -712,7 +712,7 @@ char *suffix;
712712
static char buf[200];
713713
extern char *class_name;
714714

715-
sprintf(buf, "%s%s", class_name, suffix);
715+
snprintf(buf, sizeof(buf), "%s%s", class_name, suffix);
716716
return buf;
717717
}
718718

‎BaseTools/Source/C/VfrCompile/Pccts/h/AParser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ LT(int i)
251251
if ( i >= inputTokens->bufferSize() || inputTokens->minTokens() < LLk ) /* MR20 Was "<=" */
252252
{
253253
char buf[2000]; /* MR20 Was "static" */
254-
sprintf(buf, "The minimum number of tokens you requested that the\nANTLRTokenBuffer buffer is not enough to satisfy your\nLT(%d) request; increase 'k' argument to constructor for ANTLRTokenBuffer\n", i);
254+
snprintf(buf, sizeof(buf), "The minimum number of tokens you requested that the\nANTLRTokenBuffer buffer is not enough to satisfy your\nLT(%d) request; increase 'k' argument to constructor for ANTLRTokenBuffer\n", i);
255255
panic(buf);
256256
}
257257
#endif

‎BaseTools/Source/C/VfrCompile/Pccts/h/PCCTSAST.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,7 @@ stringparser_parse_element(StringParser *parser)
602602
p->label_num = label;
603603
return p;
604604
}
605-
sprintf(ebuf, "mismatch token in scan(): %s", scan_token_str(parser->token));
605+
snprintf(ebuf, sizeof(ebuf), "mismatch token in scan(): %s", scan_token_str(parser->token));
606606
panic(ebuf);
607607
return NULL;
608608
}
@@ -659,7 +659,7 @@ stringscan_gettok(StringLexer *scanner)
659659
case '\0' : return __StringScanEOF;
660660
case __StringScanEOF : return __StringScanEOF;
661661
default :
662-
sprintf(ebuf, "invalid char in scan: '%c'", scanner->c);
662+
snprintf(ebuf, sizeof(ebuf), "invalid char in scan: '%c'", scanner->c);
663663
panic(ebuf);
664664
}
665665
return __StringScanEOF; // never reached

‎BaseTools/Source/C/VfrCompile/Pccts/support/genmk/genmk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ void help()
437437
while ( p->option!=NULL && *(p->option) != '*' )
438438
{
439439
buf[0]='\0';
440-
if ( p->arg ) sprintf(buf, "%s ___", p->option);
440+
if ( p->arg ) snprintf(buf, sizeof(buf), "%s ___", p->option);
441441
else strcpy(buf, p->option);
442442
fprintf(stderr, "\t%-16s %s\n", buf, p->descr);
443443
p++;
@@ -1058,6 +1058,6 @@ char *DIR()
10581058
static char buf[200+1];
10591059

10601060
if ( strcmp(outdir,TopDirectory)==0 ) return "";
1061-
sprintf(buf, "%s%s", outdir, DirectorySymbol);
1061+
snprintf(buf, sizeof(buf), "%s%s", outdir, DirectorySymbol);
10621062
return buf;
10631063
}

‎BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,7 @@ CIfrRecordInfoDB::IfrRecordAdjust (
14911491
//
14921492
// report error; not found
14931493
//
1494-
sprintf (ErrorMsg, "Inconsistent OpCode Record list invalid QuestionId is 0x%X", QuestionId);
1494+
snprintf (ErrorMsg, sizeof(ErrorMsg), "Inconsistent OpCode Record list invalid QuestionId is 0x%X", QuestionId);
14951495
gCVfrErrorHandle.PrintMsg (0, NULL, "Error", ErrorMsg);
14961496
Status = VFR_RETURN_MISMATCHED;
14971497
break;
@@ -1543,7 +1543,7 @@ CIfrRecordInfoDB::IfrRecordAdjust (
15431543
//
15441544
// not found matched question id, report error
15451545
//
1546-
sprintf (ErrorMsg, "QuestionId required by Inconsistent OpCode is not found. QuestionId is 0x%X", QuestionId);
1546+
snprintf (ErrorMsg, sizeof(ErrorMsg), "QuestionId required by Inconsistent OpCode is not found. QuestionId is 0x%X", QuestionId);
15471547
gCVfrErrorHandle.PrintMsg (0, NULL, "Error", ErrorMsg);
15481548
Status = VFR_RETURN_MISMATCHED;
15491549
break;
@@ -2201,7 +2201,7 @@ CIfrRecordInfoDB::IfrCheckAddDefaultRecord (
22012201
// Generate an error for question which misses default.
22022202
//
22032203
MissingDefaultCount = mAllDefaultTypeCount - QuestionDefaultInfo.mDefaultNumber;
2204-
sprintf (Msg, "The question misses %d default, the question's opcode is %d", MissingDefaultCount, pOpHead->OpCode);
2204+
snprintf (Msg, sizeof(Msg), "The question misses %d default, the question's opcode is %d", MissingDefaultCount, pOpHead->OpCode);
22052205
gCVfrErrorHandle.PrintMsg (pNode->mLineNo, NULL, "Error", Msg);
22062206
}
22072207
}

‎BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -988,7 +988,7 @@ CVfrVarDataTypeDB::Pack (
988988
CHAR8 Msg[MAX_STRING_LEN] = {0, };
989989

990990
if (Action & VFR_PACK_SHOW) {
991-
sprintf (Msg, "value of pragma pack(show) == %d", mPackAlign);
991+
snprintf (Msg, sizeof(Msg), "value of pragma pack(show) == %d", mPackAlign);
992992
gCVfrErrorHandle.PrintMsg (LineNum, NULL, "Warning", Msg);
993993
}
994994

@@ -2457,7 +2457,7 @@ CVfrDefaultStore::BufferVarStoreAltConfigAdd (
24572457

24582458
gCVfrBufferConfig.Open ();
24592459

2460-
sprintf (NewAltCfg, "%04x", pNode->mDefaultId);
2460+
snprintf (NewAltCfg, sizeof(NewAltCfg), "%04x", pNode->mDefaultId);
24612461
if ((Returnvalue = gCVfrBufferConfig.Select(VarStoreName, VarStoreGuid)) == 0) {
24622462
if ((Returnvalue = gCVfrBufferConfig.Write ('a', VarStoreName, VarStoreGuid, NewAltCfg, Type, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value)) != 0) {
24632463
goto WriteError;

0 commit comments

Comments
 (0)