changeset 3425:ca9976dc328e

[xemacs-hg @ 2006-05-25 08:04:56 by aidan] Last build problem was with eicpy_ext, not stderr_out.
author aidan
date Thu, 25 May 2006 08:04:57 +0000
parents 3204267bfd9d
children 5d3a3aa0ae4c
files src/ChangeLog src/file-coding.c
diffstat 2 files changed, 12 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Wed May 24 21:51:13 2006 +0000
+++ b/src/ChangeLog	Thu May 25 08:04:57 2006 +0000
@@ -1,3 +1,11 @@
+2006-05-25  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* file-coding.c (output_bytes_in_ascii_and_hex):
+	I installed GCC 4.0 (which may not even have been necesssary,
+	-pedantic might have done it) and it showed me that the problem my
+	last commit intended to address was in eistr_ext rather than
+	stderr_out.
+
 2006-05-16  Andrey Slusar  <anrays@gmail.com>
 
 	* objects-x.c (x_find_charset_font): Fix build with gcc 2.95.
--- a/src/file-coding.c	Wed May 24 21:51:13 2006 +0000
+++ b/src/file-coding.c	Thu May 25 08:04:57 2006 +0000
@@ -3367,15 +3367,15 @@
 static void
 output_bytes_in_ascii_and_hex (const UExtbyte *src, Bytecount n)
 {
-  UExtbyte *ascii = alloca_array (UExtbyte, n + 1);
-  UExtbyte *hex = alloca_array (UExtbyte, 3 * n + 1);
+  Extbyte *ascii = alloca_array (Extbyte, n + 1);
+  Extbyte *hex = alloca_array (Extbyte, 3 * n + 1);
   int i;
   DECLARE_EISTRING (eistr_ascii);
   DECLARE_EISTRING (eistr_hex);
 
   for (i = 0; i < n; i++)
     {
-      UExtbyte c = src[i];
+      Extbyte c = src[i];
       if (c < 0x20)
 	ascii[i] = '.';
       else
@@ -3390,8 +3390,7 @@
   eicpy_ext(eistr_hex, hex, Qbinary);
   eicpy_ext(eistr_ascii, ascii, Qbinary);
 
-  stderr_out ("%s  %s", (const CIbyte *)(eidata(eistr_ascii)), 
-	      (const CIbyte *)eidata(eistr_hex));
+  stderr_out ("%s  %s", eidata(eistr_ascii), eidata(eistr_hex));
 }
 
 #endif /* DEBUG_XEMACS */