Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-09-21 02:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

reduce deprecations

Browse Source 
Signed-off-by: Slice <sergey.slice@gmail.com>
This commit is contained in:
Slice 2024-06-14 21:14:48 +03:00
parent c0839cbee3
commit 61163074fa
15 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
BaseTools/Source/C/Common/CommonLib.c
View File

@ -526,8 +526,8 @@ Returns:
}
if (Uppercase) {
sprintf (
(CHAR8 *)Buffer,
snprintf (
(CHAR8 *)Buffer, PRINTED_GUID_BUFFER_SIZE,
"%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X",
(unsigned) Guid->Data1,
Guid->Data2,
@ -542,8 +542,8 @@ Returns:
Guid->Data4[7]
);
} else {
sprintf (
(CHAR8 *)Buffer,
snprintf (
(CHAR8 *)Buffer, PRINTED_GUID_BUFFER_SIZE,
"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
(unsigned) Guid->Data1,
Guid->Data2,

6
BaseTools/Source/C/Common/EfiUtilityMsgs.c
View File

@ -459,7 +459,7 @@ Notes:
strcpy (Line, ": ");
strncat (Line, Cptr, MAX_LINE_LEN - strlen (Line) - 1);
if (LineNumber != 0) {
sprintf (Line2, "(%u)", (unsigned) LineNumber);
snprintf (Line2, MAX_LINE_LEN, "(%u)", (unsigned) LineNumber);
strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
}
}
@ -474,7 +474,7 @@ Notes:
strncpy (Line, Cptr, MAX_LINE_LEN - 1);
Line[MAX_LINE_LEN - 1] = 0;
if (LineNumber != 0) {
sprintf (Line2, "(%u)", (unsigned) LineNumber);
snprintf (Line2, MAX_LINE_LEN, "(%u)", (unsigned) LineNumber);
strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
}
} else {
@ -501,7 +501,7 @@ Notes:
strncat (Line, ": ", MAX_LINE_LEN - strlen (Line) - 1);
strncat (Line, Type, MAX_LINE_LEN - strlen (Line) - 1);
if (MessageCode != 0) {
sprintf (Line2, " %04u", (unsigned) MessageCode);
snprintf (Line2, MAX_LINE_LEN, " %04u", (unsigned) MessageCode);
strncat (Line, Line2, MAX_LINE_LEN - strlen (Line) - 1);
}
fprintf (stdout, "%s", Line);

10
BaseTools/Source/C/Common/PcdValueCommon.c
View File

@ -257,16 +257,16 @@ Returns:
}
break;
case PcdDataTypeUint8:
sprintf(PcdList[Index].Value, "0x%02x", (UINT8)(Value & 0xff));
snprintf(PcdList[Index].Value, 20, "0x%02x", (UINT8)(Value & 0xff));
break;
case PcdDataTypeUint16:
sprintf(PcdList[Index].Value, "0x%04x", (UINT16)(Value & 0xffff));
snprintf(PcdList[Index].Value, 20, "0x%04x", (UINT16)(Value & 0xffff));
break;
case PcdDataTypeUint32:
sprintf(PcdList[Index].Value, "0x%08x", (UINT32)(Value & 0xffffffff));
snprintf(PcdList[Index].Value, 20, "0x%08x", (UINT32)(Value & 0xffffffff));
break;
case PcdDataTypeUint64:
sprintf(PcdList[Index].Value, "0x%016llx", (unsigned long long)Value);
snprintf(PcdList[Index].Value, 20, "0x%016llx", (unsigned long long)Value);
break;
case PcdDataTypePointer:
fprintf (stderr, "PCD %s.%s.%s.%s is structure. Use PcdSetPtr()\n", SkuName, DefaultValueName, TokenSpaceGuidName, TokenName);
@ -392,7 +392,7 @@ Returns:
PcdList[Index].Value = malloc(Size * 5 + 3);
PcdList[Index].Value[0] = '{';
for (ValueIndex = 0; ValueIndex < Size; ValueIndex++) {
sprintf(&PcdList[Index].Value[1 + ValueIndex * 5], "0x%02x,", Value[ValueIndex]);
snprintf(&PcdList[Index].Value[1 + ValueIndex * 5], 20, "0x%02x,", Value[ValueIndex]);
}
PcdList[Index].Value[1 + Size * 5 - 1] = '}';
PcdList[Index].Value[1 + Size * 5 ] = 0;

6
BaseTools/Source/C/GenFfs/GenFfs.c
View File

@ -819,13 +819,13 @@ Returns:
goto Finish;
}
if (Alignment < 0x400){
sprintf (AlignmentBuffer, "%d", Alignment);
snprintf (AlignmentBuffer, sizeof(AlignmentBuffer), "%d", Alignment);
}
else if (Alignment >= 0x400) {
if (Alignment >= 0x100000) {
sprintf (AlignmentBuffer, "%dM", Alignment/0x100000);
snprintf (AlignmentBuffer, sizeof(AlignmentBuffer),"%dM", Alignment/0x100000);
} else {
sprintf (AlignmentBuffer, "%dK", Alignment/0x400);
snprintf (AlignmentBuffer, sizeof(AlignmentBuffer), "%dK", Alignment/0x400);
}
}
Status = StringtoAlignment (AlignmentBuffer, &(InputFileAlign[InputFileNum]));

20
BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c
View File

@ -2302,8 +2302,8 @@ TokNode *p;
p->tclass->setnum = e;
p->tclass->setnumErrSet = eErrSet; /* MR23 */
}
sprintf(buf, "%s_set", TokenString(p->token));
sprintf(bufErrSet, "%s_errset", TokenString(p->token)); /* MR23 */
snprintf(buf, sizeof(buf), "%s_set", TokenString(p->token));
snprintf(bufErrSet, sizeof(bufErrSet), "%s_errset", TokenString(p->token)); /* MR23 */
set_name = buf;
set_nameErrSet = bufErrSet; /* MR23 */
}
@ -2325,8 +2325,8 @@ TokNode *p;
p->tclass->setnumComplement = e;
p->tclass->setnumErrSetComplement = eErrSet; /* MR23 */
}
sprintf(buf, "%s_setbar", TokenString(p->token));
sprintf(bufErrSet, "%s_errsetbar", TokenString(p->token)); /* MR23 */
snprintf(buf, sizeof(buf), "%s_setbar", TokenString(p->token));
snprintf(bufErrSet, sizeof(bufErrSet), "%s_errsetbar", TokenString(p->token)); /* MR23 */
set_name = buf;
set_nameErrSet = bufErrSet; /* MR23 */
}
@ -2335,10 +2335,10 @@ TokNode *p;
static char bufErrSet[sizeof("zzerr")+10];
int n = DefErrSet( &b, 0, NULL );
int nErrSet = DefErrSetWithSuffix(0, &bErrSet, 1, NULL, "_set");
if ( GenCC ) sprintf(buf, "err%d", n);
else sprintf(buf, "zzerr%d", n);
if ( GenCC ) sprintf(bufErrSet, "err%d", nErrSet);
else sprintf(bufErrSet, "zzerr%d", nErrSet);
if ( GenCC ) snprintf(buf, sizeof(buf), "err%d", n);
else snprintf(buf, sizeof(buf), "zzerr%d", n);
if ( GenCC ) snprintf(bufErrSet, sizeof(bufErrSet), "err%d", nErrSet);
else snprintf(bufErrSet, sizeof(bufErrSet), "zzerr%d", nErrSet);
set_name = buf;
set_nameErrSet = bufErrSet;
}
@ -4365,9 +4365,9 @@ TokNode *p;
n = DefErrSet( &a, 0, NULL );
set_free(a);
if ( GenCC )
sprintf(buf, "err%d", n);
sprintf(buf, 100, "err%d", n);
else
sprintf(buf, "zzerr%d", n);
sprintf(buf, 100, "zzerr%d", n);
return buf;
}

10
BaseTools/Source/C/VfrCompile/Pccts/antlr/main.c
View File

@ -1241,7 +1241,7 @@ int d;
{
static char buf[250]; /* DANGEROUS as hell !!!!!! */
sprintf(buf, s, d);
snprintf(buf, 250, s, d);
return( buf );
}
@ -1257,7 +1257,7 @@ int d2;
{
static char buf[250]; /* DANGEROUS as hell !!!!!! */
sprintf(buf, s, d1, d2);
snprintf(buf, 250, s, d1, d2);
return( buf );
}
@ -1306,7 +1306,7 @@ int token;
}
if (1) {
sprintf(imag_name,"UnknownToken#%d",token); /* MR13 */
sprintf(imag_name, 20, "UnknownToken#%d",token); /* MR13 */
return imag_name; /* MR13 */
}
@ -1720,7 +1720,7 @@ char *name;
{
static char buf[100];
char *p;
sprintf(buf, "%s", name);
snprintf(buf, 100, "%s", name);
for (p=buf; *p!='\0'; p++)
{
@ -1740,7 +1740,7 @@ int altnum;
{
static char buf[100];
char *p;
sprintf(buf, "_blk%d_alt%d", blockid, altnum);
snprintf(buf, 100, "_blk%d_alt%d", blockid, altnum);
p = (char *)malloc(strlen(buf)+1);
strcpy(p, buf);
return p;

4
BaseTools/Source/C/VfrCompile/Pccts/antlr/mrhoist.c
View File

@ -2215,9 +2215,9 @@ char * MR_ruleNamePlusOffset(n)
strncpy(ruleNameStatic1,n->rname,ruleNameMax);
if (offset < 0) {
sprintf(ruleNameStatic2,"%s/?",ruleNameStatic1);
snprintf(ruleNameStatic2, sizeof(ruleNameStatic2), "%s/?",ruleNameStatic1);
} else {
sprintf(ruleNameStatic2,"%s/%d",ruleNameStatic1,offset+1);
snprintf(ruleNameStatic2, sizeof(ruleNameStatic2), "%s/%d",ruleNameStatic1,offset+1);
};
return ruleNameStatic2;
}

20
BaseTools/Source/C/VfrCompile/Pccts/antlr/scan.c
View File

@ -1285,9 +1285,9 @@ static void act113()
if ( strlen(zzbegexpr)>(size_t)85 )
fatal("$i attrib ref too big");
set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s)",
if ( !GenCC ) snprintf(buf, 100, "zzaArg(zztasp%d,%s)",
BlkLevel-1,zzbegexpr+1);
else sprintf(buf,"_t%d%s",
else snprintf(buf, 100, "_t%d%s",
BlkLevel-1,zzbegexpr+1);
zzreplstr(buf);
zzmore();
@ -1308,9 +1308,9 @@ static void act114()
fatal("$i.field attrib ref too big");
zzbegexpr[strlen(zzbegexpr)-1] = ' ';
set_orel(atoi(zzbegexpr+1), &attribsRefdFromAction);
if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%d,%s).",
if ( !GenCC ) snprintf(buf, 100, "zzaArg(zztasp%d,%s).",
BlkLevel-1,zzbegexpr+1);
else sprintf(buf,"_t%d%s.",
else snprintf(buf, 100, "_t%d%s.",
BlkLevel-1,zzbegexpr+1);
zzreplstr(buf);
zzmore();
@ -1344,8 +1344,8 @@ static void act115()
*q++ = *p;
}
*q = '\0';
if ( !GenCC ) sprintf(buf,"zzaArg(zztasp%s,%s)",i,j);
else sprintf(buf,"_t%s%s",i,j);
if ( !GenCC ) snprintf(buf, sizeof(buf), "zzaArg(zztasp%s,%s)",i,j);
else snprintf(buf, sizeof(buf), "_t%s%s",i,j);
zzreplstr(buf);
zzmore();
UsedOldStyleAttrib = 1;
@ -1369,7 +1369,7 @@ static void act116()
if ( hasMultipleOperands( CurRetDef ) ) {
require (strlen(zzbegexpr)<=(size_t)285,
"$retval attrib ref too big");
sprintf(buf,"_retv.%s",&zzbegexpr[1]);
snprintf(buf, sizeof(buf), "_retv.%s",&zzbegexpr[1]);
zzreplstr(buf);
}
else zzreplstr("_retv");
@ -1439,8 +1439,8 @@ static void act120()
static char buf[100];
if ( strlen(zzbegexpr)>(size_t)85 )
fatal("#i AST ref too big");
if ( GenCC ) sprintf(buf,"_ast%d%s",BlkLevel-1,zzbegexpr+1);
else sprintf(buf,"zzastArg(%s)",zzbegexpr+1);
if ( GenCC ) snprintf(buf, sizeof(buf), "_ast%d%s",BlkLevel-1,zzbegexpr+1);
else snprintf(buf, sizeof(buf), "zzastArg(%s)",zzbegexpr+1);
zzreplstr(buf);
zzmore();
set_orel(atoi(zzbegexpr+1), &AST_nodes_refd_in_actions);
@ -1484,7 +1484,7 @@ static void act123()
strcmp(zzbegexpr, "#error")==0) )
{
static char buf[100];
sprintf(buf, "%s_ast", zzbegexpr+1);
snprintf(buf, sizeof(buf), "%s_ast", zzbegexpr+1);
/* MR27 */ list_add(&CurAstLabelsInActions, mystrdup(zzbegexpr+1));
zzreplstr(buf);
chkGTFlag();

4
BaseTools/Source/C/VfrCompile/Pccts/dlg/output.c
View File

@ -122,7 +122,7 @@ char *name;
#endif
{
static char buf[100];
sprintf(buf, "%s_h", name);
snprintf(buf, sizeof(buf), "%s_h", name);
return buf;
}
@ -712,7 +712,7 @@ char *suffix;
static char buf[200];
extern char *class_name;
sprintf(buf, "%s%s", class_name, suffix);
snprintf(buf, sizeof(buf), "%s%s", class_name, suffix);
return buf;
}

2
BaseTools/Source/C/VfrCompile/Pccts/h/AParser.cpp
View File

@ -251,7 +251,7 @@ LT(int i)
if ( i >= inputTokens->bufferSize() || inputTokens->minTokens() < LLk ) /* MR20 Was "<=" */
{
char buf[2000]; /* MR20 Was "static" */
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);
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);
panic(buf);
}
#endif

4
BaseTools/Source/C/VfrCompile/Pccts/h/PCCTSAST.cpp
View File

@ -602,7 +602,7 @@ stringparser_parse_element(StringParser *parser)
p->label_num = label;
return p;
}
sprintf(ebuf, "mismatch token in scan(): %s", scan_token_str(parser->token));
snprintf(ebuf, sizeof(ebuf), "mismatch token in scan(): %s", scan_token_str(parser->token));
panic(ebuf);
return NULL;
}
@ -659,7 +659,7 @@ stringscan_gettok(StringLexer *scanner)
case '\0' : return __StringScanEOF;
case __StringScanEOF : return __StringScanEOF;
default :
sprintf(ebuf, "invalid char in scan: '%c'", scanner->c);
snprintf(ebuf, sizeof(ebuf), "invalid char in scan: '%c'", scanner->c);
panic(ebuf);
}
return __StringScanEOF; // never reached

4
BaseTools/Source/C/VfrCompile/Pccts/support/genmk/genmk.c
View File

@ -437,7 +437,7 @@ void help()
while ( p->option!=NULL && *(p->option) != '*' )
{
buf[0]='\0';
if ( p->arg ) sprintf(buf, "%s ___", p->option);
if ( p->arg ) snprintf(buf, sizeof(buf), "%s ___", p->option);
else strcpy(buf, p->option);
fprintf(stderr, "\t%-16s %s\n", buf, p->descr);
p++;
@ -1058,6 +1058,6 @@ char *DIR()
static char buf[200+1];
if ( strcmp(outdir,TopDirectory)==0 ) return "";
sprintf(buf, "%s%s", outdir, DirectorySymbol);
snprintf(buf, sizeof(buf), "%s%s", outdir, DirectorySymbol);
return buf;
}

6
BaseTools/Source/C/VfrCompile/VfrFormPkg.cpp
View File

@ -1491,7 +1491,7 @@ CIfrRecordInfoDB::IfrRecordAdjust (
//
// report error; not found
//
sprintf (ErrorMsg, "Inconsistent OpCode Record list invalid QuestionId is 0x%X", QuestionId);
snprintf (ErrorMsg, sizeof(ErrorMsg), "Inconsistent OpCode Record list invalid QuestionId is 0x%X", QuestionId);
gCVfrErrorHandle.PrintMsg (0, NULL, "Error", ErrorMsg);
Status = VFR_RETURN_MISMATCHED;
break;
@ -1543,7 +1543,7 @@ CIfrRecordInfoDB::IfrRecordAdjust (
//
// not found matched question id, report error
//
sprintf (ErrorMsg, "QuestionId required by Inconsistent OpCode is not found. QuestionId is 0x%X", QuestionId);
snprintf (ErrorMsg, sizeof(ErrorMsg), "QuestionId required by Inconsistent OpCode is not found. QuestionId is 0x%X", QuestionId);
gCVfrErrorHandle.PrintMsg (0, NULL, "Error", ErrorMsg);
Status = VFR_RETURN_MISMATCHED;
break;
@ -2201,7 +2201,7 @@ CIfrRecordInfoDB::IfrCheckAddDefaultRecord (
// Generate an error for question which misses default.
//
MissingDefaultCount = mAllDefaultTypeCount - QuestionDefaultInfo.mDefaultNumber;
sprintf (Msg, "The question misses %d default, the question's opcode is %d", MissingDefaultCount, pOpHead->OpCode);
snprintf (Msg, sizeof(Msg), "The question misses %d default, the question's opcode is %d", MissingDefaultCount, pOpHead->OpCode);
gCVfrErrorHandle.PrintMsg (pNode->mLineNo, NULL, "Error", Msg);
}
}

4
BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
View File

@ -988,7 +988,7 @@ CVfrVarDataTypeDB::Pack (
CHAR8 Msg[MAX_STRING_LEN] = {0, };
if (Action & VFR_PACK_SHOW) {
sprintf (Msg, "value of pragma pack(show) == %d", mPackAlign);
snprintf (Msg, sizeof(Msg), "value of pragma pack(show) == %d", mPackAlign);
gCVfrErrorHandle.PrintMsg (LineNum, NULL, "Warning", Msg);
}
@ -2457,7 +2457,7 @@ CVfrDefaultStore::BufferVarStoreAltConfigAdd (
gCVfrBufferConfig.Open ();
sprintf (NewAltCfg, "%04x", pNode->mDefaultId);
snprintf (NewAltCfg, sizeof(NewAltCfg), "%04x", pNode->mDefaultId);
if ((Returnvalue = gCVfrBufferConfig.Select(VarStoreName, VarStoreGuid)) == 0) {
if ((Returnvalue = gCVfrBufferConfig.Write ('a', VarStoreName, VarStoreGuid, NewAltCfg, Type, Info.mInfo.mVarOffset, Info.mVarTotalSize, Value)) != 0) {
goto WriteError;

12
BaseTools/Source/C/VolInfo/VolInfo.c
View File

@ -1745,8 +1745,8 @@ Returns:
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");
return EFI_OUT_OF_RESOURCES;
}
sprintf (
SystemCommand,
snprintf (
SystemCommand, sizeof(SystemCommand),
OPENSSL_COMMAND_FORMAT_STRING,
OpenSslPath,
ToolOutputFileName,
@ -1987,8 +1987,8 @@ Returns:
Error (NULL, 0, 4001, "Resource", "memory cannot be allocated!");
return EFI_OUT_OF_RESOURCES;
}
sprintf (
SystemCommand,
snprintf (
SystemCommand, sizeof(SystemCommand),
EXTRACT_COMMAND_FORMAT_STRING,
ExtractionTool,
ToolOutputFile,
@ -2269,8 +2269,8 @@ Returns:
//
// Generate the format string for fscanf
//
sprintf (
FormatString,
snprintf (
FormatString, sizeof(FormatString),
"%%%us %%%us",
(unsigned) sizeof (GPtr->Guid) - 1,
(unsigned) sizeof (GPtr->BaseName) - 1