diff options
| author | Takuji Tanaka <KXD02663@nifty.ne.jp> | 2017-08-29 13:19:57 +0000 |
|---|---|---|
| committer | Takuji Tanaka <KXD02663@nifty.ne.jp> | 2017-08-29 13:19:57 +0000 |
| commit | 9be802636efdf9737227f59f80216b3cd1b2cd82 (patch) | |
| tree | f4f72a1b911a35f1696162ce2f3ab21346d3f7fd | |
| parent | 881dd51228eb89f5773369fae04db61b2c97652d (diff) | |
texk/makejvf: Suppress compiler warnings
git-svn-id: svn://tug.org/texlive/trunk@45161 c570f23f-e606-0410-a88d-b1316a301751
| -rw-r--r-- | Build/source/texk/makejvf/uniblock.c | 4 | ||||
| -rw-r--r-- | Build/source/texk/makejvf/usrtable.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Build/source/texk/makejvf/uniblock.c b/Build/source/texk/makejvf/uniblock.c index ef35d236d7e..faad3d1d886 100644 --- a/Build/source/texk/makejvf/uniblock.c +++ b/Build/source/texk/makejvf/uniblock.c @@ -344,13 +344,13 @@ int main() { usertable_charset[1].max=0xFFFB; for (ch=0x0;ch<0x10000;ch++) { - printf(" %05x %1d G:%2d C:%2d J:%2d K:%2d custom:%2d\n", ch, uniblock_iskanji, + printf(" %05lx %1d G:%2d C:%2d J:%2d K:%2d custom:%2d\n", ch, uniblock_iskanji, search_cjk_entry(ch,ENTRY_G), search_cjk_entry(ch,ENTRY_C), search_cjk_entry(ch,ENTRY_J), search_cjk_entry(ch,ENTRY_K), search_cjk_entry(ch,ENTRY_CUSTOM)); } - + return(0); } #endif diff --git a/Build/source/texk/makejvf/usrtable.c b/Build/source/texk/makejvf/usrtable.c index 1b9c070a499..54311eaa9b6 100644 --- a/Build/source/texk/makejvf/usrtable.c +++ b/Build/source/texk/makejvf/usrtable.c @@ -29,8 +29,8 @@ void get_usertable(char *name) exit(1); } for (l = 0; fgets(buf, BUF_SIZE, fp) != NULL; l++) { - if (endptr=strchr(buf, '%')) strcpy(endptr,"\n"); /* ignore after '%' */ - if (!strncmp(buf, "\n", 1)) continue; /* ignore empty line */ + if ((endptr=strchr(buf, '%')) != NULL) strcpy(endptr,"\n"); /* ignore after '%' */ + if (!strncmp(buf, "\n", 1)) continue; /* ignore empty line */ tok = strtok(buf, "\t"); if (!strcmp(tok, "REPLACE")) { if (usertable_replace_max >= MAX_TABLE) goto buferr; @@ -56,8 +56,8 @@ void get_usertable(char *name) } if ((!strcmp(tok, "+") && charset_mode) || !strcmp(tok, "CHARSET")) { charset_mode = 1; - while (tok=strtok(NULL, ",\t\n")) { - if (endptr=strstr(tok,"..")) { + while ((tok=strtok(NULL, ",\t\n")) != NULL) { + if ((endptr=strstr(tok,"..")) != NULL) { *endptr = '\0'; if (sscanf(tok, "%7s",str0) != 1) goto taberr; if (sscanf(endptr+2,"%7s",str1) != 1) goto taberr; @@ -102,7 +102,6 @@ buferr: #ifdef DEBUG int main() { int i; - long ch0,ch1; char name[]="test_user_table"; get_usertable(name); @@ -119,7 +118,8 @@ int main() { if (usertable_charset_max>0) { printf("CHARSET::\n"); for(i=0;i<usertable_charset_max;i++) - printf("%6d: %06x .. %06x\n", i, usertable_charset[i].min, usertable_charset[i].max); + printf("%6d: %06lx .. %06lx\n", i, usertable_charset[i].min, usertable_charset[i].max); } + return(0); } #endif |