[Qemacs-commit] qemacs arm.c clang.c makemode.c shell.c buffer....

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        17/04/15 05:39:02

Modified files:
        .              : arm.c clang.c makemode.c shell.c buffer.c 
                         haiku.cpp extra-modes.c 
        libqhtml       : css.c 

Log message:
        build: fix compile time warning
        - fix some warnings on unused variables and variables potentially 
          used before set
        - force definition of va_copy() and atomic_get_and_set() for haiku

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/arm.c?cvsroot=qemacs&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/qemacs/makemode.c?cvsroot=qemacs&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/qemacs/shell.c?cvsroot=qemacs&r1=1.125&r2=1.126
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/qemacs/haiku.cpp?cvsroot=qemacs&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/qemacs/extra-modes.c?cvsroot=qemacs&r1=1.58&r2=1.59
http://cvs.savannah.gnu.org/viewcvs/qemacs/libqhtml/css.c?cvsroot=qemacs&r1=1.30&r2=1.31

Patches:
Index: arm.c
===================================================================
RCS file: /sources/qemacs/qemacs/arm.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- arm.c       25 Mar 2017 18:09:50 -0000      1.6
+++ arm.c       15 Apr 2017 09:39:02 -0000      1.7
@@ -216,6 +216,7 @@
     } else {
         int has_assembly = 0;
 
+        i = 0;
         if (w > 0 && qe_isxdigit(str[w])) {
             for (i = w + 1; qe_isxdigit(str[i]); i++)
                 continue;

Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- clang.c     10 Apr 2017 17:09:22 -0000      1.123
+++ clang.c     15 Apr 2017 09:39:02 -0000      1.124
@@ -482,9 +482,9 @@
             &&  (str[i] == '\"' && str[i + 1] == '\"')) {
                 /* multiline """ quoted string */
                 i += 2;
+            parse_string3:
                 state |= IN_C_STRING_BQ;
                 style1 = C_STYLE_STRING;
-            parse_string3:
                 while (i < n) {
                     c = str[i++];
                     if (c == '\\' && flavor != CLANG_KOTLIN) {

Index: makemode.c
===================================================================
RCS file: /sources/qemacs/qemacs/makemode.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- makemode.c  3 Apr 2017 08:33:57 -0000       1.28
+++ makemode.c  15 Apr 2017 09:39:02 -0000      1.29
@@ -237,7 +237,8 @@
                         if (str[i] == '}')
                             break;
                     }
-                    SET_COLOR(str, start, i, style);
+                    SET_COLOR(str, start, i, CMAKE_STYLE_MACRO);
+                    start = i;
                 }
             }
             SET_COLOR(str, start, i, CMAKE_STYLE_STRING);

Index: shell.c
===================================================================
RCS file: /sources/qemacs/qemacs/shell.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- shell.c     12 Apr 2017 07:56:15 -0000      1.125
+++ shell.c     15 Apr 2017 09:39:02 -0000      1.126
@@ -1188,7 +1188,8 @@
             /* CG: ESC2(']','4') should parse color definition string */
             /* (example: "\033]4;16;rgb:00/00/00\033\134" ) */
             // executeXtermSetRgb
-            // iTerm2 reports the current rgb value with "<index>;?", e.g. 
"105;?" -> report as \033]4;P;rgb:00/cc/ff\007",
+            // iTerm2 reports the current rgb value with "<index>;?",
+            //   e.g. "105;?" -> report as \033]4;P;rgb:00/cc/ff\007",
             s->state = QE_TERM_STATE_NORM;
         }
         break;

Index: buffer.c
===================================================================
RCS file: /sources/qemacs/qemacs/buffer.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- buffer.c    14 Apr 2017 06:59:17 -0000      1.111
+++ buffer.c    15 Apr 2017 09:39:02 -0000      1.112
@@ -2235,6 +2235,10 @@
     int len, size, written;
     va_list ap2;
 
+#ifndef va_copy
+#define va_copy(s,d)  __va_copy(s,d)
+#endif
+
     va_copy(ap2, ap);
     size = sizeof(buf0);
     buf = buf0;

Index: haiku.cpp
===================================================================
RCS file: /sources/qemacs/qemacs/haiku.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- haiku.cpp   11 Apr 2017 06:46:13 -0000      1.16
+++ haiku.cpp   15 Apr 2017 09:39:02 -0000      1.17
@@ -352,6 +352,8 @@
     return 0;
 }
 
+extern int32 atomic_get_and_set(int32 *p, int32 v);
+
 /* called when an BMessage is forwarded. dispatch events to qe_handle_event() 
*/
 static void haiku_handle_event(void *opaque)
 {
@@ -662,7 +664,7 @@
 
 static QEFont *haiku_open_font(QEditScreen *s, int style, int size)
 {
-    WindowState *ctx = (WindowState *)s->priv_data;
+    //WindowState *ctx = (WindowState *)s->priv_data;
     //fprintf(stderr, "%s()\n", __FUNCTION__);
     QEFont *font;
 

Index: extra-modes.c
===================================================================
RCS file: /sources/qemacs/qemacs/extra-modes.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- extra-modes.c       11 Apr 2017 07:27:14 -0000      1.58
+++ extra-modes.c       15 Apr 2017 09:39:02 -0000      1.59
@@ -3120,8 +3120,8 @@
 
         case '\"':
             /* parse double quoted string const */
-            c = '\0';
         parse_string2:
+            c = '\0';
             while (i < n) {
                 c = str[i++];
                 if (c == '\\') {

Index: libqhtml/css.c
===================================================================
RCS file: /sources/qemacs/qemacs/libqhtml/css.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- libqhtml/css.c      11 Apr 2017 06:46:13 -0000      1.30
+++ libqhtml/css.c      15 Apr 2017 09:39:02 -0000      1.31
@@ -3778,7 +3778,7 @@
 
 #define MAX_LINE_SIZE 256
 
-int box_get_text(CSSContext *s,
+int box_get_text(qe__unused__ CSSContext *s,
                  unsigned int *line_buf, int max_size,
                  int *offsets, CSSBox *box)
 {