diff options
author | Martin Ruckert <martin.ruckert@hm.edu> | 2021-12-09 11:05:40 +0000 |
---|---|---|
committer | Martin Ruckert <martin.ruckert@hm.edu> | 2021-12-09 11:05:40 +0000 |
commit | 88187b2ba51ecf7da96b726b8f44d3378f3d28d3 (patch) | |
tree | 0146bbef4ac1df34fda4531e4777533cbba19a58 /Build/source/texk | |
parent | 9276704ef402e1d70885424aff429e10a5ca1efd (diff) |
adding \n to error messages, eliminating a reassign if the factors for hsize or vsize change.
git-svn-id: svn://tug.org/texlive/trunk@61256 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rw-r--r-- | Build/source/texk/web2c/hitexdir/hiformat.w | 36 | ||||
-rw-r--r-- | Build/source/texk/web2c/hitexdir/hitex.w | 4 |
2 files changed, 18 insertions, 22 deletions
diff --git a/Build/source/texk/web2c/hitexdir/hiformat.w b/Build/source/texk/web2c/hitexdir/hiformat.w index 05bd04baa51..b97f28d16f9 100644 --- a/Build/source/texk/web2c/hitexdir/hiformat.w +++ b/Build/source/texk/web2c/hitexdir/hiformat.w @@ -47,9 +47,9 @@ \def\setrevision$#1: #2 ${\gdef\lastrevision{#2}} -\setrevision$Revision: 2571 $ +\setrevision$Revision: 2595 $ \def\setdate$#1(#2) ${\gdef\lastdate{#2}} -\setdate$Date: 2021-11-22 17:37:05 +0100 (Mon, 22 Nov 2021) $ +\setdate$Date: 2021-12-06 13:18:44 +0100 (Mon, 06 Dec 2021) $ \null @@ -6263,25 +6263,25 @@ bool hcheck_banner(char *magic) char *t; t=hbanner; if (strncmp(magic,hbanner,4)!=0) - { MESSAGE("This is not a %s file",magic); return false; } + { MESSAGE("This is not a %s file\n",magic); return false; } else t+=4; hbanner_size=(int)strnlen(hbanner,MAX_BANNER); if(hbanner[hbanner_size-1]!='\n') - { MESSAGE("Banner exceeds maximum size=0x%x",MAX_BANNER); return false; } + { MESSAGE("Banner exceeds maximum size=0x%x\n",MAX_BANNER); return false; } if (*t!=' ') - { MESSAGE("Space expected in banner after %s",magic); return false; } + { MESSAGE("Space expected in banner after %s\n",magic); return false; } else t++; v=strtol(t,&t,10); if (v!=HINT_VERSION) - { MESSAGE("Wrong HINT version: got %d, expected %d",v,HINT_VERSION); return false; } + { MESSAGE("Wrong HINT version: got %d, expected %d\n",v,HINT_VERSION); return false; } if (*t!='.') - { MESSAGE("Dot expected in banner after HINT version number"); return false; } + { MESSAGE("Dot expected in banner after HINT version number\n"); return false; } else t++; v=strtol(t,&t,10); if (v!=HINT_SUB_VERSION) - { MESSAGE("Wrong HINT subversion: got %d, expected %d",v,HINT_SUB_VERSION); return false; } + { MESSAGE("Wrong HINT subversion: got %d, expected %d\n",v,HINT_SUB_VERSION); return false; } if (*t!=' ' && *t!='\n') - { MESSAGE("Space expected in banner after HINT subversion"); return false; } + { MESSAGE("Space expected in banner after HINT subversion\n"); return false; } LOG("%s file version %d.%d:%s",magic,HINT_VERSION, HINT_SUB_VERSION, t); DBG(DBGDIR,"banner size=0x%x\n",hbanner_size); return true; @@ -6491,14 +6491,14 @@ bool hget_map(void) uint64_t u; f= fopen(hin_name,"rb"); if (f==NULL)@/ - { MESSAGE("Unable to open file: %s", hin_name);@+ return false;@+ } + { MESSAGE("Unable to open file: %s\n", hin_name);@+ return false;@+ } if (stat(hin_name,&st)<0) - { MESSAGE("Unable to obtain file size: %s", hin_name); + { MESSAGE("Unable to obtain file size: %s\n", hin_name); fclose(f); return false; } if (st.st_size==0) - { MESSAGE("File %s is empty", hin_name); + { MESSAGE("File %s is empty\n", hin_name); fclose(f); return false; } @@ -6506,7 +6506,7 @@ bool hget_map(void) if (hin_addr!=NULL) hget_unmap(); hin_addr=malloc(u); if (hin_addr==NULL) - { MESSAGE("Unable to allocate 0x%"PRIx64" byte for File %s", u,hin_name); + { MESSAGE("Unable to allocate 0x%"PRIx64" byte for File %s\n", u,hin_name); fclose(f); return 0; } @@ -6514,7 +6514,7 @@ bool hget_map(void) do{ s=fread(hin_addr+t,1,u,f); if (s<=0) - { MESSAGE("Unable to read file %s",hin_name); + { MESSAGE("Unable to read file %s\n",hin_name); fclose(f); free(hin_addr); hin_addr=NULL; @@ -6543,14 +6543,14 @@ bool hget_map(void) int fd; fd = open(hin_name, O_RDONLY, 0); if (fd<0)@/ - { MESSAGE("Unable to open file %s", hin_name);@+ return false;@+ } + { MESSAGE("Unable to open file %s\n", hin_name);@+ return false;@+ } if (fstat(fd, &st)<0) - { MESSAGE("Unable to get file size"); + { MESSAGE("Unable to get file size\n"); close(fd); return false; } if (st.st_size==0) - { MESSAGE("File %s is empty",hin_name); + { MESSAGE("File %s is empty\n",hin_name); close(fd); return false; } @@ -6561,7 +6561,7 @@ bool hget_map(void) if (hin_addr==MAP_FAILED) { close(fd); hin_addr=NULL;hin_size=0; - MESSAGE("Unable to map file into memory"); + MESSAGE("Unable to map file into memory\n"); return 0; } close(fd); diff --git a/Build/source/texk/web2c/hitexdir/hitex.w b/Build/source/texk/web2c/hitexdir/hitex.w index 535a820e910..b338dde9351 100644 --- a/Build/source/texk/web2c/hitexdir/hitex.w +++ b/Build/source/texk/web2c/hitexdir/hitex.w @@ -6290,10 +6290,6 @@ assign_trace(p,"into")@;@/ @p static void eq_word_define(pointer @!p, int @!w) {@+ -if (eTeX_ex&&(eqtb[p].i==w)) - {@+assign_trace(p,"reassigning")@;@/ - return; - } assign_trace(p,"changing")@;@/ if (cur_level==level_one)@t\1@> { if (p==dimen_base+hsize_code) |