qemacs-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemacs-commit] qemacs buffer.c clang.c html2png.c script.c cfb...


From: Charlie Gordon
Subject: [Qemacs-commit] qemacs buffer.c clang.c html2png.c script.c cfb...
Date: Tue, 27 May 2014 22:59:50 +0000

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        14/05/27 22:59:50

Modified files:
        .              : buffer.c clang.c html2png.c script.c cfb.c 
                         extra-modes.c htmlsrc.c tty.c charset.c 
                         extras.c qe.c util.c 

Log message:
        prevent strict warnings

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.69&r2=1.70
http://cvs.savannah.gnu.org/viewcvs/qemacs/html2png.c?cvsroot=qemacs&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/qemacs/script.c?cvsroot=qemacs&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/qemacs/cfb.c?cvsroot=qemacs&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/qemacs/extra-modes.c?cvsroot=qemacs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/qemacs/htmlsrc.c?cvsroot=qemacs&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/qemacs/tty.c?cvsroot=qemacs&r1=1.61&r2=1.62
http://cvs.savannah.gnu.org/viewcvs/qemacs/charset.c?cvsroot=qemacs&r1=1.36&r2=1.37
http://cvs.savannah.gnu.org/viewcvs/qemacs/extras.c?cvsroot=qemacs&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.175&r2=1.176
http://cvs.savannah.gnu.org/viewcvs/qemacs/util.c?cvsroot=qemacs&r1=1.65&r2=1.66

Patches:
Index: buffer.c
===================================================================
RCS file: /sources/qemacs/qemacs/buffer.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- buffer.c    26 May 2014 14:35:37 -0000      1.81
+++ buffer.c    27 May 2014 22:59:48 -0000      1.82
@@ -812,12 +812,14 @@
             len = min(size, ssizeof(buf));
             if (b->style_shift == 2) {
                 for (i = 0; i < len; i += 4) {
-                    *(uint32_t*)(buf + i) = style;
+                    /* XXX: should enforce 32 bit alignment of buf */
+                    *(uint32_t*)(void *)(buf + i) = style;
                 }
             } else
             if (b->style_shift == 1) {
                 for (i = 0; i < len; i += 2) {
-                    *(uint16_t*)(buf + i) = style;
+                    /* XXX: should enforce 16 bit alignment of buf */
+                    *(uint16_t*)(void *)(buf + i) = style;
                 }
             } else {
                 memset(buf, style, len);
@@ -900,7 +902,7 @@
 
     /* If inserting, try and coalesce log record with previous */
     if (op == LOGOP_INSERT && b->last_log == LOGOP_INSERT
-    &&  b->log_new_index >= sizeof(lb) + sizeof(int)
+    &&  (size_t)b->log_new_index >= sizeof(lb) + sizeof(int)
     &&  eb_read(b->log_buffer, b->log_new_index - sizeof(int), &size_trailer,
                 sizeof(int)) == sizeof(int)
     &&  size_trailer == 0

Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -b -r1.69 -r1.70
--- clang.c     27 May 2014 12:05:53 -0000      1.69
+++ clang.c     27 May 2014 22:59:48 -0000      1.70
@@ -675,7 +675,7 @@
                     for (i++; i < n;) {
                         c = str[i++];
                         if (c == delim) {
-                            if (str[i] == c) {
+                            if (str[i] == (unsigned int)c) {
                                 i++;
                                 continue;
                             }
@@ -1115,7 +1115,7 @@
                 goto unindent;
         }
         /* NOTE: strings & comments are correctly ignored there */
-        if ((c == '&' || c == '|') && buf[i + 1] == c)
+        if ((c == '&' || c == '|') && buf[i + 1] == (unsigned int)c)
             goto unindent;
 
         if (c == '}') {

Index: html2png.c
===================================================================
RCS file: /sources/qemacs/qemacs/html2png.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- html2png.c  23 Jan 2014 12:56:22 -0000      1.14
+++ html2png.c  27 May 2014 22:59:48 -0000      1.15
@@ -194,7 +194,7 @@
     f = fopen(filename, "w");
     if (!f)
         return -1;
-    data = (unsigned int *)cfb->base;
+    data = (unsigned int *)(void *)cfb->base;
     w = s->width;
     h = s->height;
 

Index: script.c
===================================================================
RCS file: /sources/qemacs/qemacs/script.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- script.c    27 May 2014 12:05:52 -0000      1.13
+++ script.c    27 May 2014 22:59:48 -0000      1.14
@@ -74,7 +74,7 @@
                 if (c == '\\' && i < n && str[start] == '"')
                     i++;
                else
-                if (c == str[start])
+                if ((unsigned int)c == str[start])
                     break;
             }
             SET_COLOR(str, start, i, style);

Index: cfb.c
===================================================================
RCS file: /sources/qemacs/qemacs/cfb.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cfb.c       17 Dec 2013 16:06:35 -0000      1.9
+++ cfb.c       27 May 2014 22:59:48 -0000      1.10
@@ -64,7 +64,7 @@
         for (y = 0; y < h; y++) {
             d = dest;
             for (n = w; n != 0; n--) {
-                ((short *)d)[0] ^= 0xffff;
+                ((uint16_t *)(void *)d)[0] ^= 0xffff;
                 d += 2;
             }
             dest += cfb->wrap;
@@ -75,21 +75,21 @@
             n = w;
 
             if (((int)d & 3) != 0) {
-                ((short *)d)[0] = col;
+                ((uint16_t *)(void *)d)[0] = col;
                 d += 2;
                 n--;
             }
 
             while (n >= 8) {
-                ((int *)d)[0] = col;
-                ((int *)d)[1] = col;
-                ((int *)d)[2] = col;
-                ((int *)d)[3] = col;
+                ((uint32_t *)(void *)d)[0] = col;
+                ((uint32_t *)(void *)d)[1] = col;
+                ((uint32_t *)(void *)d)[2] = col;
+                ((uint32_t *)(void *)d)[3] = col;
                 d += 16;
                 n -= 8;
             }
             while (n > 0) {
-                ((short *)d)[0] = col;
+                ((uint16_t *)(void *)d)[0] = col;
                 d += 2;
                 n--;
             }
@@ -114,7 +114,7 @@
         for (y = 0; y < h; y++) {
             d = dest;
             for (n = w; n != 0; n--) {
-                ((int *)d)[0] ^= 0x00ffffff;
+                ((uint32_t *)(void *)d)[0] ^= 0x00ffffff;
                 d += 4;
             }
             dest += cfb->wrap;
@@ -124,15 +124,15 @@
             d = dest;
             n = w;
             while (n >= 4) {
-                ((int *)d)[0] = col;
-                ((int *)d)[1] = col;
-                ((int *)d)[2] = col;
-                ((int *)d)[3] = col;
+                ((uint32_t *)(void *)d)[0] = col;
+                ((uint32_t *)(void *)d)[1] = col;
+                ((uint32_t *)(void *)d)[2] = col;
+                ((uint32_t *)(void *)d)[3] = col;
                 d += 16;
                 n -= 4;
             }
             while (n > 0) {
-                ((int *)d)[0] = col;
+                ((uint32_t *)(void *)d)[0] = col;
                 d += 4;
                 n--;
             }
@@ -160,20 +160,20 @@
         d = dest;
         while (n >= 4) {
             if (s[0] >= 0x80)
-                ((short *)d)[0] = col;
+                ((uint16_t *)(void *)d)[0] = col;
             if (s[1] >= 0x80)
-                ((short *)d)[1] = col;
+                ((uint16_t *)(void *)d)[1] = col;
             if (s[2] >= 0x80)
-                ((short *)d)[2] = col;
+                ((uint16_t *)(void *)d)[2] = col;
             if (s[3] >= 0x80)
-                ((short *)d)[3] = col;
+                ((uint16_t *)(void *)d)[3] = col;
             s += 4;
             d += 4 * 2;
             n -= 4;
         }
         while (n > 0) {
             if (s[0] >= 0x80)
-                ((short *)d)[0] = col;
+                ((uint16_t *)(void *)d)[0] = col;
             s++;
             d += 2;
             n--;
@@ -204,20 +204,20 @@
         d = dest;
         while (n >= 4) {
             if (s[0] >= 0x80)
-                ((int *)d)[0] = col;
+                ((uint32_t *)(void *)d)[0] = col;
             if (s[1] >= 0x80)
-                ((int *)d)[1] = col;
+                ((uint32_t *)(void *)d)[1] = col;
             if (s[2] >= 0x80)
-                ((int *)d)[2] = col;
+                ((uint32_t *)(void *)d)[2] = col;
             if (s[3] >= 0x80)
-                ((int *)d)[3] = col;
+                ((uint32_t *)(void *)d)[3] = col;
             s += 4;
             d += 4 * 4;
             n -= 4;
         }
         while (n > 0) {
             if (s[0] >= 0x80)
-                ((int *)d)[0] = col;
+                ((uint32_t *)(void *)d)[0] = col;
             s++;
             d += 4;
             n--;

Index: extra-modes.c
===================================================================
RCS file: /sources/qemacs/qemacs/extra-modes.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- extra-modes.c       27 May 2014 15:50:47 -0000      1.22
+++ extra-modes.c       27 May 2014 22:59:49 -0000      1.23
@@ -280,7 +280,7 @@
         case '\"':
             /* parse string const */
             while (i < n) {
-                if (str[i++] == c)
+                if (str[i++] == (unsigned int)c)
                     break;
             }
             SET_COLOR(str, start, i, BASIC_STYLE_STRING);
@@ -443,7 +443,7 @@
             comm = 0;
             /* parse string const */
             while (i < n) {
-                if (str[i++] == c)
+                if (str[i++] == (unsigned int)c)
                     break;
             }
             SET_COLOR(str, start, i, VIM_STYLE_STRING);
@@ -456,7 +456,7 @@
                     if (str[i] == '\\' && i + 1 < n) {
                         i += 2;
                     } else
-                    if (str[i++] == c)
+                    if (str[i++] == (unsigned int)c)
                         break;
                 }
                 SET_COLOR(str, start, i, VIM_STYLE_REGEX);
@@ -468,7 +468,7 @@
             &&  (qe_isblank(str[i - 2]) || str[i - 2] == '=')) {
                 /* parse string const */
                 for (j = i; j < n;) {
-                    if (str[j++] == c) {
+                    if (str[j++] == (unsigned int)c) {
                         i = j;
                         SET_COLOR(str, start, i, VIM_STYLE_STRING);
                         break;
@@ -489,7 +489,7 @@
                 if (str[i] == '\\' && i + 1 < n) {
                     i += 2;
                 } else
-                if (str[i++] == c) {
+                if (str[i++] == (unsigned int)c) {
                     style = VIM_STYLE_STRING;
                     break;
                 }
@@ -692,7 +692,7 @@
             /* parse string or char const */
             while (i < n) {
                 /* XXX: escape sequences? */
-                if (str[i++] == c)
+                if (str[i++] == (unsigned int)c)
                     break;
             }
             SET_COLOR(str, start, i, PASCAL_STYLE_STRING);
@@ -1132,7 +1132,7 @@
                     i++;
                     continue;
                 }
-                if (str[i] == c) {
+                if (str[i] == (unsigned int)c) {
                     i++;
                     break;
                 }
@@ -1423,7 +1423,7 @@
     return i;
 }
 
-int julia_get_number(const unsigned int *p)
+static int julia_get_number(const unsigned int *p)
 {
     const unsigned int *p0 = p;
     int c;
@@ -1476,7 +1476,7 @@
     return p - p0;
 }
 
-void julia_colorize_line(QEColorizeContext *cp,
+static void julia_colorize_line(QEColorizeContext *cp,
                          unsigned int *str, int n, int mode_flags)
 {
     int i = 0, start = i, c, sep = 0, klen;
@@ -1521,7 +1521,7 @@
             /* parse string or character const */
             sep = c;
             state = IN_JULIA_STRING;
-            if (str[i] == sep && str[i + 1] == sep) {
+            if (str[i] == (unsigned int)sep && str[i + 1] == (unsigned 
int)sep) {
                 /* multi-line string """ ... """ */
                 state = IN_JULIA_LONG_STRING;
                 i += 2;
@@ -1533,7 +1533,7 @@
                             i += 1;
                         }
                     } else
-                    if (c == sep && str[i] == sep && str[i + 1] == sep) {
+                    if (c == sep && str[i] == (unsigned int)sep && str[i + 1] 
== (unsigned int)sep) {
                         i += 2;
                         state = 0;
                         break;
@@ -1728,7 +1728,7 @@
                             state = IN_HASKELL_STRING;
                         }
                     } else
-                    if (str[i] == '^' && i + 1 < n && str[i + 1] != sep) {
+                    if (str[i] == '^' && i + 1 < n && str[i + 1] != (unsigned 
int)sep) {
                         i += 2;
                     } else {
                         i += 1;
@@ -1889,7 +1889,7 @@
             i--;
         has_quote:
             sep = str[i++];
-            if (str[i] == sep && str[i + 1] == sep) {
+            if (str[i] == (unsigned int)sep && str[i + 1] == (unsigned 
int)sep) {
                 /* long string */
                 state = (sep == '\"') ? IN_PYTHON_LONG_STRING2 :
                         IN_PYTHON_LONG_STRING;
@@ -1902,7 +1902,7 @@
                             i += 1;
                         }
                     } else
-                    if (c == sep && str[i] == sep && str[i + 1] == sep) {
+                    if (c == sep && str[i] == (unsigned int)sep && str[i + 1] 
== (unsigned int)sep) {
                         i += 2;
                         state = 0;
                         break;
@@ -2376,7 +2376,7 @@
                     for (; qe_isalnum_(str[j]); j++) {
                         sig = ((sig << 6) + str[j]) % 61;
                     }
-                    if (str[j++] != sep)
+                    if (str[j++] != (unsigned int)sep)
                         break;
                 } else
                 if (qe_isalpha_(str[j])) {

Index: htmlsrc.c
===================================================================
RCS file: /sources/qemacs/qemacs/htmlsrc.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- htmlsrc.c   27 May 2014 12:05:54 -0000      1.18
+++ htmlsrc.c   27 May 2014 22:59:49 -0000      1.19
@@ -242,7 +242,7 @@
                     state |= IN_HTML_ENTITY;
                     break;
                 }
-                if (str[i] == delim) {
+                if (str[i] == (unsigned int)delim) {
                     i++;
                     state &= ~(IN_HTML_STRING | IN_HTML_STRING1);
                     break;

Index: tty.c
===================================================================
RCS file: /sources/qemacs/qemacs/tty.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -b -r1.61 -r1.62
--- tty.c       14 May 2014 17:40:53 -0000      1.61
+++ tty.c       27 May 2014 22:59:49 -0000      1.62
@@ -888,7 +888,7 @@
     }
 }
 
-int str_get_word(char *buf, int size, const char *p, const char **pp)
+static int str_get_word(char *buf, int size, const char *p, const char **pp)
 {
     int len;
 
@@ -912,7 +912,7 @@
 }
 
 /* match a keyword, ignore case, check word boundary */
-int str_match_word(const char *str, const char *val, const char **pp)
+static int str_match_word(const char *str, const char *val, const char **pp)
 {
     if (stristart(str, val, &str) && (*str == '\0' || *str == ' ')) {
         while (*str == ' ')
@@ -1180,7 +1180,7 @@
                 ptr1[shadow] = cc;
                 ptr1++;
                 ch = TTYCHAR_GETCH(cc);
-                if (ch != TTYCHAR_NONE) {
+                if ((unsigned int)ch != TTYCHAR_NONE) {
                     /* output attributes */
                   again:
                     if (bgcolor != (int)TTYCHAR_GETBG(cc)) {

Index: charset.c
===================================================================
RCS file: /sources/qemacs/qemacs/charset.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- charset.c   7 Apr 2014 20:48:49 -0000       1.36
+++ charset.c   27 May 2014 22:59:49 -0000      1.37
@@ -635,7 +635,7 @@
     int line, col;
 
     line = 0;
-    lp = p = (const uint16_t *)buf;
+    lp = p = (const uint16_t *)(const void *)buf;
     p1 = p + (size >> 1);
     u.n = 0;
     u.c[s->charset == &charset_ucs2be] = s->eol_char;
@@ -671,7 +671,7 @@
     uint16_t nl, lf;
     union { uint16_t n; char c[2]; } u;
 
-    lp = p = (const uint16_t *)buf;
+    lp = p = (const uint16_t *)(const void *)buf;
     p1 = p + (size >> 1);
     u.n = 0;
     u.c[s->charset == &charset_ucs2be] = s->eol_char;
@@ -769,7 +769,7 @@
         return size >> 1;
 
     nb_skip = 0;
-    buf_ptr = (const uint16_t *)buf;
+    buf_ptr = (const uint16_t *)(const void *)buf;
     buf_end = buf_ptr + (size >> 1);
     u.n = 0;
     u.c[s->charset == &charset_ucs2be] = '\n';
@@ -797,7 +797,7 @@
         return min(pos << 1, size);
 
     nb_chars = 0;
-    buf_ptr = (const uint16_t *)buf;
+    buf_ptr = (const uint16_t *)(const void *)buf;
     buf_end = buf_ptr + (size >> 1);
     u.n = 0;
     u.c[s->charset == &charset_ucs2be] = '\n';
@@ -910,7 +910,7 @@
     int line, col;
 
     line = 0;
-    lp = p = (const uint32_t *)buf;
+    lp = p = (const uint32_t *)(const void *)buf;
     p1 = p + (size >> 2);
     u.n = 0;
     u.c[(s->charset == &charset_ucs4be) * 3] = s->eol_char;
@@ -945,7 +945,7 @@
     uint32_t nl, lf;
     union { uint32_t n; char c[4]; } u;
 
-    lp = p = (const uint32_t *)buf;
+    lp = p = (const uint32_t *)(const void *)buf;
     p1 = p + (size >> 2);
     u.n = 0;
     u.c[(s->charset == &charset_ucs4be) * 3] = s->eol_char;
@@ -1042,7 +1042,7 @@
         return size >> 2;
 
     nb_skip = 0;
-    buf_ptr = (const uint32_t *)buf;
+    buf_ptr = (const uint32_t *)(const void *)buf;
     buf_end = buf_ptr + (size >> 2);
     u.n = 0;
     u.c[(s->charset == &charset_ucs4be) * 3] = '\n';
@@ -1069,7 +1069,7 @@
         return min(pos << 2, size);
 
     nb_chars = 0;
-    buf_ptr = (const uint32_t *)buf;
+    buf_ptr = (const uint32_t *)(const void *)buf;
     buf_end = buf_ptr + (size >> 2);
     u.n = 0;
     u.c[(s->charset == &charset_ucs4be) * 3] = '\n';
@@ -1273,7 +1273,7 @@
 
     eol_type = *eol_typep;
 
-    p = (const uint16_t *)buf;
+    p = (const uint16_t *)(const void *)buf;
     p1 = p + (size >> 1) - 1;
     u.n = 0;
     u.c[charset == &charset_ucs2be] = '\r';
@@ -1331,7 +1331,7 @@
 
     eol_type = *eol_typep;
 
-    p = (const uint32_t *)buf;
+    p = (const uint32_t *)(const void *)buf;
     p1 = p + (size >> 2) - 1;
     u.n = 0;
     u.c[(charset == &charset_ucs4be) * 3] = '\r';

Index: extras.c
===================================================================
RCS file: /sources/qemacs/qemacs/extras.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- extras.c    26 May 2014 14:35:38 -0000      1.30
+++ extras.c    27 May 2014 22:59:49 -0000      1.31
@@ -121,7 +121,7 @@
     eb_delete_range(s->b, from, to);
 }
 
-void do_delete_blank_lines(EditState *s)
+static void do_delete_blank_lines(EditState *s)
 {
     /* Delete blank lines:
      * On blank line, delete all surrounding blank lines, leaving just one.
@@ -164,7 +164,7 @@
     eb_delete_range(b, from, offset);
 }
 
-void eb_tabify(EditBuffer *b, int p1, int p2)
+static void eb_tabify(EditBuffer *b, int p1, int p2)
 {
     /* We implement a complete analysis of the region instead of
      * scanning for certain space patterns (such as / [ \t]/).  It is
@@ -226,7 +226,7 @@
     }
 }
 
-void do_tabify_buffer(EditState *s)
+static void do_tabify_buffer(EditState *s)
 {
     /* deactivate region hilite */
     s->region_style = 0;
@@ -234,7 +234,7 @@
     eb_tabify(s->b, 0, s->b->total_size);
 }
 
-void do_tabify_region(EditState *s)
+static void do_tabify_region(EditState *s)
 {
     /* deactivate region hilite */
     s->region_style = 0;
@@ -242,7 +242,7 @@
     eb_tabify(s->b, s->b->mark, s->offset);
 }
 
-void eb_untabify(EditBuffer *b, int p1, int p2)
+static void eb_untabify(EditBuffer *b, int p1, int p2)
 {
     /* We implement a complete analysis of the region instead of
      * potentially faster scan for '\t'.  It is fast enough and even
@@ -282,7 +282,7 @@
     }
 }
 
-void do_untabify_buffer(EditState *s)
+static void do_untabify_buffer(EditState *s)
 {
     /* deactivate region hilite */
     s->region_style = 0;
@@ -290,7 +290,7 @@
     eb_untabify(s->b, 0, s->b->total_size);
 }
 
-void do_untabify_region(EditState *s)
+static void do_untabify_region(EditState *s)
 {
     /* deactivate region hilite */
     s->region_style = 0;
@@ -298,7 +298,7 @@
     eb_untabify(s->b, s->b->mark, s->offset);
 }
 
-void do_indent_region(EditState *s)
+static void do_indent_region(EditState *s)
 {
     int col_num, line1, line2;
 

Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -b -r1.175 -r1.176
--- qe.c        27 May 2014 15:50:47 -0000      1.175
+++ qe.c        27 May 2014 22:59:49 -0000      1.176
@@ -1327,7 +1327,7 @@
     if (c == accent) {
         eb_delete(s->b, offset0, s->offset - offset0);
     } else
-    if (((expand_ligature(g, c) && g[1] == accent)
+    if (((expand_ligature(g, c) && g[1] == (unsigned int)accent)
     ||   (c != '\n' && combine_accent(g, c, accent)))
     &&  (len = eb_encode_uchar(s->b, buf, g[0])) > 0) {
         /* XXX: should bypass eb_encode_uchar to detect encoding failure */
@@ -1911,6 +1911,7 @@
     buf_size = eb_read(b, 0, buf, sizeof(buf));
     eol_type = b->eol_type;
     /* XXX: detect_charset returns a default charset */
+    /* XXX: should enforce 32 bit alignment of buf */
     charset = detect_charset(buf, buf_size, &eol_type);
     eb_set_charset(b, charset, eol_type);
     if (verbose) {
@@ -2186,7 +2187,7 @@
     s->indent_tabs_mode = (val != 0);
 }
 
-void do_set_fill_column(EditState *s, int fill_column)
+static void do_set_fill_column(EditState *s, int fill_column)
 {
     if (fill_column > 1)
         s->b->fill_column = fill_column;
@@ -2627,7 +2628,7 @@
         size--;
     }
     while (size >= 4) {
-        sum += ((sum >> 31) & 1) + sum + *(const uint32_t *)data;
+        sum += ((sum >> 31) & 1) + sum + *(const uint32_t *)(const void *)data;
         data += 4;
         size -= 4;
     }
@@ -3402,7 +3403,7 @@
 
 #endif /* CONFIG_TINY */
 
-int get_staticly_colorized_line(EditState *s, unsigned int *buf, int buf_size,
+static int get_staticly_colorized_line(EditState *s, unsigned int *buf, int 
buf_size,
                                 int *offset_ptr, int line_num)
 {
     EditBuffer *b = s->b;
@@ -5930,6 +5931,7 @@
                 goto fail;
             }
             /* autodetect buffer charset */
+            /* XXX: should enforce 32 bit alignment of buf */
             charset = detect_charset(buf, buf_size, &eol_type);
         }
         buf[buf_size] = '\0';

Index: util.c
===================================================================
RCS file: /sources/qemacs/qemacs/util.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- util.c      25 Apr 2014 20:08:17 -0000      1.65
+++ util.c      27 May 2014 22:59:50 -0000      1.66
@@ -814,7 +814,7 @@
     int c = val[0];
 
     for (; *str != '\0'; str++) {
-        if (*str == c && ustrstart(str, val, NULL))
+        if (*str == (unsigned int)c && ustrstart(str, val, NULL))
             return str;
     }
     return NULL;



reply via email to

[Prev in Thread] Current Thread [Next in Thread]