tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: fix format type build warnings 

Fix build warnings of "format ?%d? expects argument of type ?int?, but
argument 5 has type ?long unsigned int? [-Wformat=]" for BaseTools,
while using "gcc version 4.8.4 (Ubuntu 4.8.4-2ubuntu1~14.04.3)".

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Heyi Guo <heyi.guo@linaro.org>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Heyi Guo 2016-12-15 14:49:46 +08:00 committed by Yonghong Zhu
parent 5b26adf03a
commit 8230d45bba
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BaseTools/Source/C/VfrCompile/Pccts/antlr/bits.c
View File

@ -573,13 +573,13 @@ const char *suffix;
else else
fprintf(DefFile, "extern SetWordType zzerr%d[];\n", esetnum); fprintf(DefFile, "extern SetWordType zzerr%d[];\n", esetnum);
if ( name!=NULL ) { if ( name!=NULL ) {
fprintf(ErrFile, "SetWordType %s%s[%d] = {", fprintf(ErrFile, "SetWordType %s%s[%lu] = {",
name, name,
suffix, suffix,
NumWords(TokenNum-1)*sizeof(unsigned)); NumWords(TokenNum-1)*sizeof(unsigned));
} }
else { else {
fprintf(ErrFile, "SetWordType zzerr%d[%d] = {", fprintf(ErrFile, "SetWordType zzerr%d[%lu] = {",
esetnum, esetnum,
NumWords(TokenNum-1)*sizeof(unsigned)); NumWords(TokenNum-1)*sizeof(unsigned));
} }
@ -641,20 +641,20 @@ const char *suffix;
esetnum++; esetnum++;
if ( name!=NULL ) { if ( name!=NULL ) {
fprintf(Parser_h, "\tstatic SetWordType %s%s[%d];\n", name, suffix, fprintf(Parser_h, "\tstatic SetWordType %s%s[%lu];\n", name, suffix,
NumWords(TokenNum-1)*sizeof(unsigned)); NumWords(TokenNum-1)*sizeof(unsigned));
fprintf(Parser_c, "SetWordType %s::%s%s[%d] = {", fprintf(Parser_c, "SetWordType %s::%s%s[%lu] = {",
CurrentClassName, CurrentClassName,
name, name,
suffix, suffix,
NumWords(TokenNum-1)*sizeof(unsigned)); NumWords(TokenNum-1)*sizeof(unsigned));
} }
else { else {
fprintf(Parser_c, "SetWordType %s::err%d[%d] = {", fprintf(Parser_c, "SetWordType %s::err%d[%lu] = {",
CurrentClassName, CurrentClassName,
esetnum, esetnum,
NumWords(TokenNum-1)*sizeof(unsigned)); NumWords(TokenNum-1)*sizeof(unsigned));
fprintf(Parser_h, "\tstatic SetWordType err%d[%d];\n", esetnum, fprintf(Parser_h, "\tstatic SetWordType err%d[%lu];\n", esetnum,
NumWords(TokenNum-1)*sizeof(unsigned)); NumWords(TokenNum-1)*sizeof(unsigned));
} }
@ -787,7 +787,7 @@ GenParser_c_Hdr()
/* Build constructors */ /* Build constructors */
fprintf(Parser_c, "\n%s::", CurrentClassName); fprintf(Parser_c, "\n%s::", CurrentClassName);
fprintf(Parser_c, "%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%d)\n", fprintf(Parser_c, "%s(ANTLRTokenBuffer *input) : %s(input,%d,%d,%d,%lu)\n",
CurrentClassName, CurrentClassName,
(BaseClassName == NULL ? "ANTLRParser" : BaseClassName), (BaseClassName == NULL ? "ANTLRParser" : BaseClassName),
OutputLL_k, OutputLL_k,
@ -912,7 +912,7 @@ GenErrHdr( )
#ifdef DUM #ifdef DUM
if ( LexGen ) fprintf(ErrFile, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken)); if ( LexGen ) fprintf(ErrFile, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
#endif #endif
fprintf(ErrFile, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned)); fprintf(ErrFile, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
if ( DemandLookahead ) fprintf(ErrFile, "#define DEMAND_LOOK\n"); if ( DemandLookahead ) fprintf(ErrFile, "#define DEMAND_LOOK\n");
fprintf(ErrFile, "#include \"antlr.h\"\n"); fprintf(ErrFile, "#include \"antlr.h\"\n");
if ( GenAST ) fprintf(ErrFile, "#include \"ast.h\"\n"); if ( GenAST ) fprintf(ErrFile, "#include \"ast.h\"\n");

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

@ -3911,7 +3911,7 @@ int file;
} }
#endif #endif
/* ###WARNING: This will have to change when SetWordSize changes */ /* ###WARNING: This will have to change when SetWordSize changes */
if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned)); if ( !GenCC ) _gen1("#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
if (TraceGen) { if (TraceGen) {
_gen("#ifndef zzTRACE_RULES\n"); /* MR20 */ _gen("#ifndef zzTRACE_RULES\n"); /* MR20 */
_gen("#define zzTRACE_RULES\n"); /* MR20 */ _gen("#define zzTRACE_RULES\n"); /* MR20 */
@ -4125,7 +4125,7 @@ char * gate; /* MR10 */
if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken)); if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));
#endif #endif
/* ###WARNING: This will have to change when SetWordSize changes */ /* ###WARNING: This will have to change when SetWordSize changes */
fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned)); fprintf(f, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));
if (TraceGen) { if (TraceGen) {
fprintf(f,"#ifndef zzTRACE_RULES\n"); /* MR20 */ fprintf(f,"#ifndef zzTRACE_RULES\n"); /* MR20 */
fprintf(f,"#define zzTRACE_RULES\n"); /* MR20 */ fprintf(f,"#define zzTRACE_RULES\n"); /* MR20 */