[Qemacs-commit] qemacs hex.c unihex.c

[Charlie Gordon]

CVSROOT:        /cvsroot/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        08/04/05 18:16:30

Modified files:
        .              : hex.c unihex.c 

Log message:
        fixed mingw compilation

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/hex.c?cvsroot=qemacs&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/qemacs/unihex.c?cvsroot=qemacs&r1=1.14&r2=1.15

Patches:
Index: hex.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/hex.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- hex.c       25 Mar 2008 10:13:37 -0000      1.24
+++ hex.c       5 Apr 2008 18:16:30 -0000       1.25
@@ -48,7 +48,7 @@
 
 static int hex_display(EditState *s, DisplayState *ds, int offset)
 {
-    int j, len, eof;
+    int j, len, ateof;
     int offset1;
     unsigned char b;
 
@@ -59,7 +59,7 @@
 
     ds->style = QE_STYLE_FUNCTION;
 
-    eof = 0;
+    ateof = 0;
     len = s->b->total_size - offset;
     if (len > s->disp_width)
         len = s->disp_width;
@@ -71,8 +71,8 @@
                 eb_read(s->b, offset + j, &b, 1);
                 display_printhex(ds, offset1, offset1 + 1, b, 2);
             } else {
-                if (!eof) {
-                    eof = 1;
+                if (!ateof) {
+                    ateof = 1;
                 } else {
                     offset1 = -2;
                 }
@@ -86,15 +86,15 @@
     }
     ds->style = 0;
 
-    eof = 0;
+    ateof = 0;
     for (j = 0; j < s->disp_width; j++) {
         offset1 = offset + j;
         if (j < len) {
             eb_read(s->b, offset + j, &b, 1);
         } else {
             b = ' ';
-            if (!eof) {
-                eof = 1;
+            if (!ateof) {
+                ateof = 1;
             } else {
                 offset1 = -2;
             }

Index: unihex.c
===================================================================
RCS file: /cvsroot/qemacs/qemacs/unihex.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- unihex.c    11 Jan 2008 11:29:29 -0000      1.14
+++ unihex.c    5 Apr 2008 18:16:30 -0000       1.15
@@ -49,13 +49,13 @@
 
 static int unihex_display(EditState *s, DisplayState *ds, int offset)
 {
-    int j, len, eof;
+    int j, len, ateof;
     int offset1;
     unsigned int b;
     unsigned int buf[LINE_MAX_SIZE];
     unsigned int pos[LINE_MAX_SIZE];
 
-    eof = 0;
+    ateof = 0;
     display_bol(ds);
 
     ds->style = QE_STYLE_COMMENT;
@@ -80,8 +80,8 @@
         if (j < len) {
             display_printhex(ds, pos[j], pos[j+1], buf[j], 4);
         } else {
-            if (!eof) {
-                eof = 1;
+            if (!ateof) {
+                ateof = 1;
                 display_printf(ds, pos[j], pos[j] + 1, "    ");
             } else {
                 display_printf(ds, -1, -1, "    ");
@@ -103,8 +103,8 @@
             display_char(ds, pos[j], pos[j+1], b);
         } else {
             b = ' ';
-            if (!eof) {
-                eof = 1;
+            if (!ateof) {
+                ateof = 1;
                 display_char(ds, pos[j], pos[j] + 1, b);
             } else {
                 display_char(ds, -1, -1, b);