diff options
Diffstat (limited to 'Build/source/texk/web2c/cwebdir/common.c')
-rw-r--r-- | Build/source/texk/web2c/cwebdir/common.c | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/Build/source/texk/web2c/cwebdir/common.c b/Build/source/texk/web2c/cwebdir/common.c index 16733c11856..5f3b490d2ba 100644 --- a/Build/source/texk/web2c/cwebdir/common.c +++ b/Build/source/texk/web2c/cwebdir/common.c @@ -36,12 +36,12 @@ #define compress(c) if(loc++<=limit) return c \ -#define xisalpha(c) (isalpha((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisdigit(c) (isdigit((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisspace(c) (isspace((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xislower(c) (islower((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisupper(c) (isupper((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) -#define xisxdigit(c) (isxdigit((eight_bits) (c) ) &&((eight_bits) (c) <0200) ) +#define xisalpha(c) (isalpha((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisdigit(c) (isdigit((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisspace(c) (isspace((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xislower(c) (islower((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisupper(c) (isupper((int) (c) ) &&((eight_bits) (c) <0200) ) +#define xisxdigit(c) (isxdigit((int) (c) ) &&((eight_bits) (c) <0200) ) #define isxalpha(c) ((c) =='_'||(c) =='$') \ #define ishigh(c) ((eight_bits) (c) > 0177) \ @@ -93,13 +93,13 @@ #define max_sections 2000 \ #define lines_dont_match (change_limit-change_buffer!=limit-buffer|| \ -strncmp(buffer,change_buffer,(size_t) (limit-buffer) ) ) \ +strncmp(buffer,change_buffer,(size_t) (limit-buffer) ) !=0) \ #define if_section_start_make_pending(b) \ *limit= '!'; \ for(loc= buffer;xisspace(*loc) ;loc++) ; \ *limit= ' '; \ -if(*loc=='@'&&(xisspace(*(loc+1) ) ||*(loc+1) =='*') ) change_pending= b; \ +if(*loc=='@'&&(xisspace(*(loc+1) ) ||*(loc+1) =='*') ) change_pending= b \ #define too_long() {include_depth--; \ err_print("! Include file name too long") ;goto restart;} \ @@ -107,10 +107,10 @@ err_print("! Include file name too long") ;goto restart;} \ #define hash_size 353 \ #define first_chunk(p) ((p) ->byte_start+2) -#define prefix_length(p) (int) ((eight_bits) *((p) ->byte_start) *256+ \ +#define prefix_length(p) (size_t) ((eight_bits) *((p) ->byte_start) *256+ \ (eight_bits) *((p) ->byte_start+1) ) -#define set_prefix_length(p,m) (*((p) ->byte_start) = (m) /256, \ -*((p) ->byte_start+1) = (m) %256) \ +#define set_prefix_length(p,m) (*((p) ->byte_start) = (char) ((m) /256) , \ +*((p) ->byte_start+1) = (char) ((m) %256) ) \ #define less 0 #define equal 1 @@ -344,7 +344,7 @@ extern void reset_input(void); #line 166 "common.h" extern boolean names_match(name_pointer,const char*,size_t,eight_bits); -extern name_pointer id_lookup(const char*,const char*,char); +extern name_pointer id_lookup(const char*,const char*,eight_bits); extern name_pointer section_lookup(char*,char*,boolean); extern void init_node(name_pointer); @@ -382,13 +382,13 @@ static void check_change(void); /*:33*//*55:*/ #line 764 "common.w" -static int web_strcmp(char*,int,char*,int); +static int web_strcmp(char*,size_t,char*,size_t); static name_pointer add_section_name(name_pointer,int,char*,char*,boolean); static void extend_section_name(name_pointer,char*,char*,boolean); /*:55*//*64:*/ #line 991 "common.w" -static int section_name_cmp(char**,int,name_pointer); +static int section_name_cmp(char**,size_t,name_pointer); /*:64*//*76:*/ #line 1186 "common.w" @@ -484,7 +484,7 @@ change_line++; if(!input_ln(change_file))return; if(limit<buffer+2)continue; if(buffer[0]!='@')continue; -if(xisupper(buffer[1]))buffer[1]= tolower((eight_bits)buffer[1]); +if(xisupper(buffer[1]))buffer[1]= tolower((int)buffer[1]); if(buffer[1]=='x')break; if(buffer[1]=='y'||buffer[1]=='z'||buffer[1]=='i'){ loc= buffer+2; @@ -544,7 +544,7 @@ change_limit= change_buffer;changing= false; return; } if(limit> buffer+1&&buffer[0]=='@'){ -char xyz_code= xisupper(buffer[1])?tolower((eight_bits)buffer[1]):buffer[1]; +char xyz_code= xisupper(buffer[1])?tolower((int)buffer[1]):buffer[1]; /*34:*/ #line 336 "common.w" @@ -644,7 +644,7 @@ changed_section[section_count]= true;change_pending= false; } *limit= ' '; if(buffer[0]=='@'){ -if(xisupper(buffer[1]))buffer[1]= tolower((eight_bits)buffer[1]); +if(xisupper(buffer[1]))buffer[1]= tolower((int)buffer[1]); if(buffer[1]=='x'||buffer[1]=='y'){ loc= buffer+2; err_print("! Where is the matching @z?"); @@ -707,7 +707,7 @@ include_depth++; char temp_file_name[max_file_name_length]; char*cur_file_name_end= cur_file_name+max_file_name_length-1; char*kk,*k= cur_file_name; -int l; +size_t l; if(*loc=='"'){ loc++; @@ -777,18 +777,18 @@ name_pointer id_lookup( const char*first, const char*last, -char t) +eight_bits t) { const char*i= first; int h; -int l; +size_t l; name_pointer p; if(last==NULL)for(last= first;*last!='\0';last++); -l= (int)(last-first); +l= (size_t)(last-first); /*49:*/ #line 656 "common.w" -h= (eight_bits)*i; +h= (int)((eight_bits)*i); while(++i<last)h= (h+h+(int)((eight_bits)*i))%hash_size; @@ -871,7 +871,7 @@ print_prefix_name( name_pointer p) { char*s= first_chunk(p); -int l= prefix_length(p); +size_t l= prefix_length(p); term_write(s,l); if(s+l<(p+1)->byte_start)term_write("...",3); } @@ -881,9 +881,9 @@ if(s+l<(p+1)->byte_start)term_write("...",3); static int web_strcmp( char*j, -int j_len, +size_t j_len, char*k, -int k_len) +size_t k_len) { char*j1= j+j_len,*k1= k+k_len; while(k<k1&&j<j1&&*j==*k)k++,j++; @@ -907,7 +907,7 @@ boolean ispref) { name_pointer p= name_ptr; char*s= first_chunk(p); -int name_len= (int)(last-first)+ispref; +size_t name_len= (size_t)(last-first+(int)ispref); if(s+name_len> byte_mem_end)overflow("byte memory"); if(name_ptr+1>=name_dir_end)overflow("name"); (++name_ptr)->byte_start= byte_ptr= s+name_len; @@ -936,7 +936,7 @@ boolean ispref) { char*s; name_pointer q= p+1; -int name_len= (int)(last-first)+ispref; +size_t name_len= (size_t)(last-first+(int)ispref); if(name_ptr>=name_dir_end)overflow("name"); while(q->link!=name_dir)q= q->link; q->link= name_ptr; @@ -962,7 +962,7 @@ name_pointer q= NULL; name_pointer r= NULL; name_pointer par= NULL; -int name_len= (int)(last-first)+1; +size_t name_len= (size_t)(last-first+1); /*60:*/ #line 878 "common.w" @@ -1046,7 +1046,7 @@ return r; static int section_name_cmp( char**pfirst, -int len, +size_t len, name_pointer r) { char*first= *pfirst; @@ -1058,7 +1058,7 @@ while(true){ ss= (r+1)->byte_start-1; if(*ss==' '&&ss>=r->byte_start)ispref= true,q= q->link; else ispref= false,ss++,q= name_dir; -switch(c= web_strcmp(first,len,s,ss-s)){ +switch(c= web_strcmp(first,len,s,(size_t)(ss-s))){ case equal:if(q==name_dir) if(ispref){ *pfirst= first+(ptrdiff_t)(ss-s); @@ -1082,7 +1082,7 @@ void err_print( const char*s) { -printf(*s=='!'?"\n%s":"%s",s); +*s=='!'?printf("\n%s",s):printf("%s",s); if(web_file_open)/*67:*/ #line 1032 "common.w" |