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>

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

diff --git a/BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c b/BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c
index b99054534b8401f3ebb3a22dad638af5f3f1666f..d0a448d31d2e5a6635912ac506800590ca47cccc 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c
+++ b/BaseTools/Source/C/VfrCompile/Pccts/antlr/gen.c
@@ -3911,7 +3911,7 @@ int file;
        }\r
 #endif\r
        /* ###WARNING: This will have to change when SetWordSize changes */\r
-       if ( !GenCC ) _gen1("#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));\r
+       if ( !GenCC ) _gen1("#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));\r
     if (TraceGen) {\r
       _gen("#ifndef zzTRACE_RULES\n");  /* MR20 */\r
       _gen("#define zzTRACE_RULES\n");  /* MR20 */\r
@@ -4125,7 +4125,7 @@ char * gate;                                    /* MR10 */
        if ( LexGen ) fprintf(f, "#define zzEOF_TOKEN %d\n", (TokenInd!=NULL?TokenInd[EofToken]:EofToken));\r
 #endif\r
        /* ###WARNING: This will have to change when SetWordSize changes */\r
-       fprintf(f, "#define zzSET_SIZE %d\n", NumWords(TokenNum-1)*sizeof(unsigned));\r
+       fprintf(f, "#define zzSET_SIZE %lu\n", NumWords(TokenNum-1)*sizeof(unsigned));\r
     if (TraceGen) {\r
       fprintf(f,"#ifndef zzTRACE_RULES\n");  /* MR20 */\r
       fprintf(f,"#define zzTRACE_RULES\n");  /* MR20 */\r