4 files changed, 27 insertions, 28 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 5dd7bb4cefb..7c7790a62e8 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,16 @@
+2011-04-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Avoid 'differ in signedness' warnings.
+	* ptex-base.ch: Cast buffer and str_pool to string when used as
+	arg of multistrlen() or fromBUFF().
+	(pack_buffered_name): Drop change already done in ../tex.ch.
+
+	* pbibtex.ch: Cast buffer to string when used as a arg of
+	input_line2().
+
+	* ppltotf.ch: Cast buffer to string when used as a arg of
+	input_line2() or multistrlen().
+
 2011-04-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* ptex-base.ch: Add \ifdbox and \ifddir,
diff --git a/Build/source/texk/web2c/ptexdir/pbibtex.ch b/Build/source/texk/web2c/ptexdir/pbibtex.ch
index 3475e14a365..ee2cd84682f 100644
--- a/Build/source/texk/web2c/ptexdir/pbibtex.ch
+++ b/Build/source/texk/web2c/ptexdir/pbibtex.ch
@@ -203,11 +203,11 @@ var i:c_int_type;
     end;
   vgetc (f); {skip the eol}
 @y
-  last := input_line2(f,buffer,last,buf_size,address_of(i));
+  last := input_line2(f,stringcast(buffer),last,buf_size,address_of(i));
   while (not eof(f)) and (last > 0) and (i <> 10) and (i <> 13) do
   begin
     buffer_overflow;
-    last := input_line2(f,buffer,last,buf_size,address_of(i));
+    last := input_line2(f,stringcast(buffer),last,buf_size,address_of(i));
   end;
 @z
 
diff --git a/Build/source/texk/web2c/ptexdir/ppltotf.ch b/Build/source/texk/web2c/ptexdir/ppltotf.ch
index f050a64d9db..bdba99662ba 100644
--- a/Build/source/texk/web2c/ptexdir/ppltotf.ch
+++ b/Build/source/texk/web2c/ptexdir/ppltotf.ch
@@ -60,7 +60,7 @@ else  begin while (limit<buf_size-2)and(not eoln(pl_file)) do
     begin incr(limit); read(pl_file,buffer[limit]);
     end;
 @y
-else  begin limit:=input_line2(pl_file,buffer,limit+1,buf_size-1)-1;
+else  begin limit:=input_line2(pl_file,stringcast(buffer),limit+1,buf_size-1)-1;
 @z
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -647,7 +647,7 @@ The |jis_to_index| is called from |chars_in_type| command.
 function get_next_raw:byte; {get next rawdata in buffer}
 begin while loc=limit do fill_buffer;
 incr(loc); get_next_raw:=buffer[loc];
-if multistrlen(buffer,loc+2,loc)=2 then cur_char:=" "
+if multistrlen(stringcast(buffer),loc+2,loc)=2 then cur_char:=" "
 else cur_char:=xord[buffer[loc]];
 end;
 @#
@@ -718,8 +718,8 @@ else if (ch='J')or(ch='j') then
   if not valid_jis_code(jis_code) then
     err_print('jis code ', jis_code:1, ' is invalid');
   end
-else if multistrlen(buffer, loc+2, loc)=2 then
-  begin jis_code:=toDVI(fromBUFF(buffer, loc+2, loc));
+else if multistrlen(stringcast(buffer), loc+2, loc)=2 then
+  begin jis_code:=toDVI(fromBUFF(stringcast(buffer), loc+2, loc));
   incr(loc); cur_char:=" ";
   if not valid_jis_code(jis_code) then
     err_print('jis code ', jis_code:1, ' is invalid');
diff --git a/Build/source/texk/web2c/ptexdir/ptex-base.ch b/Build/source/texk/web2c/ptexdir/ptex-base.ch
index ca0028a7cd8..acbcf143a81 100644
--- a/Build/source/texk/web2c/ptexdir/ptex-base.ch
+++ b/Build/source/texk/web2c/ptexdir/ptex-base.ch
@@ -1546,8 +1546,8 @@ begin switch: if loc<=limit then {current line not yet finished}
 @^inner loop@>
 begin switch: if loc<=limit then {current line not yet finished}
   begin cur_chr:=buffer[loc]; incr(loc);
-    if multistrlen(buffer, limit+1, loc-1)=2 then
-      begin cur_chr:=fromBUFF(buffer, limit+1, loc-1);
+    if multistrlen(stringcast(buffer), limit+1, loc-1)=2 then
+      begin cur_chr:=fromBUFF(stringcast(buffer), limit+1, loc-1);
       cur_cmd:=kcat_code(kcatcodekey(cur_chr));
       incr(loc);
       end
@@ -1636,8 +1636,8 @@ end
 @<Scan a control...@>=
 begin if loc>limit then cur_cs:=null_cs {|state| is irrelevant in this case}
 else  begin k:=loc; cur_chr:=buffer[k]; incr(k);
-  if multistrlen(buffer, limit+1, k-1)=2 then
-    begin cat:=kcat_code(kcatcodekey(fromBUFF(buffer, limit+1, k-1))); incr(k);
+  if multistrlen(stringcast(buffer), limit+1, k-1)=2 then
+    begin cat:=kcat_code(kcatcodekey(fromBUFF(stringcast(buffer), limit+1, k-1))); incr(k);
     end
   else cat:=cat_code(cur_chr);
 start_cs:
@@ -1720,8 +1720,8 @@ end
 @y
 @ @<Scan ahead in the buffer...@>=
 begin repeat cur_chr:=buffer[k]; incr(k);
-  if multistrlen(buffer, limit+1, k-1)=2 then
-    begin cat:=kcat_code(kcatcodekey(fromBUFF(buffer, limit+1, k-1))); incr(k);
+  if multistrlen(stringcast(buffer), limit+1, k-1)=2 then
+    begin cat:=kcat_code(kcatcodekey(fromBUFF(stringcast(buffer), limit+1, k-1))); incr(k);
     end
   else cat:=cat_code(cur_chr);
   while (buffer[k]=cur_chr)and(cat=sup_mark)and(k<limit) do
@@ -2154,8 +2154,8 @@ else if scan_keyword("sp") then goto done
   if t=" " then t:=space_token
   else t:=other_token+t;
 @y
-  if multistrlen(str_pool, pool_ptr, k)=2 then
-    begin t:=fromBUFF(str_pool, pool_ptr, k); incr(k);
+  if multistrlen(stringcast(str_pool), pool_ptr, k)=2 then
+    begin t:=fromBUFF(stringcast(str_pool), pool_ptr, k); incr(k);
     end
   else if t=" " then t:=space_token
   else t:=other_token+t;
@@ -2369,20 +2369,6 @@ else if (cur_cmd>active_char)or(cur_chr>255) then
   end;
 @z
 
-@x [29.523] l.10571 - pTeX: xord
-for j:=1 to n do append_to_name(xord[TEX_format_default[j]]);
-for j:=a to b do append_to_name(buffer[j]);
-for j:=format_default_length-format_ext_length+1 to format_default_length do
-  append_to_name(xord[TEX_format_default[j]]);
-@y
-if name_of_file then libc_free (name_of_file);
-name_of_file := xmalloc (1 + n + (b - a + 1) + format_ext_length + 1);
-for j:=1 to n do append_to_name(xord[TEX_format_default[j]]);
-for j:=a to b do append_to_name(buffer[j]);
-for j:=format_default_length-format_ext_length+1 to format_default_length do
-  append_to_name(xord[TEX_format_default[j]]);
-@z
-
 @x [29.526] l.10668 - pTeX: scan file name
 loop@+begin if (cur_cmd>other_char)or(cur_chr>255) then {not a character}
     begin back_input; goto done;