[Qemacs-commit] qemacs arabic.c buffer.c clang.c latex-mode.c qe.c

[Charlie Gordon]

CVSROOT:        /sources/qemacs
Module name:    qemacs
Changes by:     Charlie Gordon <chqrlie>        13/11/23 19:11:14

Modified files:
        .              : arabic.c buffer.c clang.c latex-mode.c qe.c 

Log message:
        fixed gcc 4.7 warnings about variables set but unused

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/qemacs/arabic.c?cvsroot=qemacs&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/qemacs/buffer.c?cvsroot=qemacs&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/qemacs/clang.c?cvsroot=qemacs&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/qemacs/latex-mode.c?cvsroot=qemacs&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/qemacs/qe.c?cvsroot=qemacs&r1=1.97&r2=1.98

Patches:
Index: arabic.c
===================================================================
RCS file: /sources/qemacs/qemacs/arabic.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- arabic.c    3 Jan 2008 09:51:30 -0000       1.7
+++ arabic.c    23 Nov 2013 19:11:13 -0000      1.8
@@ -219,7 +219,8 @@
 int arab_join(unsigned int *line, __unused__ unsigned int *ctog, int len)
 {
     int a, b, c, i, j, res;
-    const ArabicChar *aa, *bb, *cc;
+    //const ArabicChar *aa;
+    const ArabicChar *bb, *cc;
 
     a = 0;
     for (i = 0; i < len;) {
@@ -234,7 +235,7 @@
             i++;
         }
         /* apply Unicode Arabic substitution rules */
-        aa = find_char(a); /* previous */
+        //aa = find_char(a); /* previous */
         bb = find_char(b); /* current */
         cc = find_char(c); /* next */
 

Index: buffer.c
===================================================================
RCS file: /sources/qemacs/qemacs/buffer.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- buffer.c    2 May 2008 17:05:38 -0000       1.44
+++ buffer.c    23 Nov 2013 19:11:13 -0000      1.45
@@ -243,7 +243,7 @@
                       int size)
 {
     Page *p, *p_start, *q;
-    int size_start, len, n, page_index;
+    int len, n, page_index;
 
     if (dest->flags & BF_READONLY)
         return;
@@ -295,7 +295,6 @@
 
     /* compute the number of complete pages to insert */
     p_start = p;
-    size_start = size;
     while (size > 0 && p->size <= size) {
         size -= p->size;
         p++;

Index: clang.c
===================================================================
RCS file: /sources/qemacs/qemacs/clang.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- clang.c     25 Apr 2008 10:46:58 -0000      1.39
+++ clang.c     23 Nov 2013 19:11:13 -0000      1.40
@@ -425,8 +425,10 @@
                             state = INDENT_FIND_EQ;
                         }
                     } else {
+                       if (stack[--stack_ptr] != '}') {
                         /* XXX: syntax check ? */
-                        stack_ptr--;
+                           goto check_instr;
+                       }
                         goto check_instr;
                     }
                     break;
@@ -442,8 +444,9 @@
                         pos = find_pos(s, buf, p - buf) + 1;
                         goto end_parse;
                     } else {
+                       if (stack[--stack_ptr] != (c == '(' ? ')' : ']')) {
                         /* XXX: syntax check ? */
-                        stack_ptr--;
+                       }
                     }
                     break;
                 case ' ':

Index: latex-mode.c
===================================================================
RCS file: /sources/qemacs/qemacs/latex-mode.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- latex-mode.c        25 Apr 2008 10:46:59 -0000      1.30
+++ latex-mode.c        23 Nov 2013 19:11:14 -0000      1.31
@@ -247,8 +247,8 @@
     p = strrchr(func->es->b->filename, '/');
     if (p == func->es->b->filename)
         p++;
-    len = p - func->es->b->filename + 1;
-    pstrcpy(dir, sizeof(dir), func->es->b->filename);
+    len = p - func->es->b->filename;
+    pstrncpy(dir, sizeof(dir), func->es->b->filename, len);
     chdir(dir);
 
     if (func->output_to_buffer) {

Index: qe.c
===================================================================
RCS file: /sources/qemacs/qemacs/qe.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- qe.c        23 Nov 2013 10:53:13 -0000      1.97
+++ qe.c        23 Nov 2013 19:11:14 -0000      1.98
@@ -542,7 +542,7 @@
 void do_fill_paragraph(EditState *s)
 {
     int par_start, par_end, col;
-    int offset, offset1, n, c, line_count, indent_size;
+    int offset, offset1, n, c, indent_size;
     int chunk_start, word_start, word_size, word_count, space_size;
     unsigned char buf[1];
 
@@ -566,7 +566,6 @@
     col = 0;
     offset = par_start;
     word_count = 0;
-    line_count = 0;
     while (offset < par_end) {
         /* skip spaces */
         chunk_start = offset;
@@ -4964,7 +4963,6 @@
     static void (*cb)(void *opaque, char *buf);
     static void *opaque;
     char buf[4096], *retstr;
-    int len;
 
     /* if completion is activated, then select current file only if
        the selection is highlighted */
@@ -4987,7 +4985,7 @@
         do_refresh(s);
     }
 
-    len = eb_get_contents(s->b, buf, sizeof(buf));
+    eb_get_contents(s->b, buf, sizeof(buf));
     if (hist && hist->nb_items > 0) {
         /* if null string, do not insert in history */
         hist->nb_items--;
@@ -7110,7 +7108,7 @@
     char line[1024], str[1024];
     char prompt[64], cmd[128], *q, *strp;
     const char *p, *r;
-    int err, line_num;
+    int line_num;
     CmdDef *d;
     int nb_args, c, sep, i, skip;
     CmdArg args[MAX_CMD_ARGS];
@@ -7121,7 +7119,6 @@
         return -1;
     ec = qs->ec;
     skip = 0;
-    err = 0;
     line_num = 0;
     /* Should parse whole config file in a single read, or load it via
      * a buffer */
@@ -7208,7 +7205,6 @@
         /* search for command */
         d = qe_find_cmd(cmd);
         if (!d) {
-            err = -1;
             put_status(s, "Unknown command '%s'", cmd);
             continue;
         }
@@ -7698,7 +7694,10 @@
     EditState *s;
     EditBuffer *b;
     QEDisplay *dpy;
-    int i, _optind, is_player;
+    int i, _optind;
+#if !defined(CONFIG_TINY) && !defined(CONFIG_WIN32)
+    int is_player;
+#endif
 
     qs->ec.function = "qe-init";
     qs->macro_key_index = -1; /* no macro executing */
@@ -7749,6 +7748,7 @@
     load_all_modules(qs);
 #endif
 
+#if !defined(CONFIG_TINY) && !defined(CONFIG_WIN32)
 #if 0
     /* see if invoked as player */
     {
@@ -7764,6 +7764,7 @@
     /* Start in dired mode when invoked with no arguments */
     is_player = 1;
 #endif
+#endif
 
     /* init of the editor state */
     qs->screen = &global_screen;