From 6be7d3dab6a206d26d1845e3791eaf26be1be72f Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Tue, 8 Mar 2011 09:28:17 -0800
Subject: * cm.c (cmgoto): Mark variables that gcc -Wuninitialized does not

deduce are never used uninitialized.
---
 src/cm.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/cm.c')

diff --git a/src/cm.c b/src/cm.c
index d4aedad6db4..af4116f3fec 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -330,7 +330,7 @@ cmgoto (struct tty_display_info *tty, int row, int col)
             llcost,
             relcost,
             directcost;
-    int     use;
+    int     use IF_LINT (= 0);
     char   *p,
            *dcm;
 
@@ -460,4 +460,3 @@ Wcm_init (struct tty_display_info *tty)
     return - 2;
   return 0;
 }
-
-- 
cgit v1.2.1


From fbceeba21b3b5aeb2a0f98d4ca937cabbe07fab0 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Tue, 8 Mar 2011 18:12:00 -0800
Subject: * cm.c (calccost, cmgoto): Use const pointers where appropriate.

* cm.h (struct cm): Likewise.
* dispextern.h (do_line_insertion_deletion_costs): Likewise.
* scroll.c (ins_del_costs, do_line_insertion_deletion_costs): Likewise.
* term.c (tty_ins_del_lines, calculate_costs, struct fkey_table):
(term_get_fkeys_1, append_glyphless_glyph, produce_glyphless_glyph):
(turn_on_face, init_tty): Likewise.
* termchar.h (struct tty_display_info): Likewise.
* term.c (tgetflag, tgetnum, tgetstr): Redefine to use const pointers.
---
 src/cm.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/cm.c')

diff --git a/src/cm.c b/src/cm.c
index af4116f3fec..108ee5720f3 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -199,7 +199,7 @@ calccost (struct tty_display_info *tty,
             tabx,
             tab2x,
             tabcost;
-    register char  *p;
+    register const char *p;
 
     /* If have just wrapped on a terminal with xn,
        don't believe the cursor position: give up here
@@ -331,8 +331,8 @@ cmgoto (struct tty_display_info *tty, int row, int col)
             relcost,
             directcost;
     int     use IF_LINT (= 0);
-    char   *p,
-           *dcm;
+    char *p;
+    const char *dcm;
 
   /* First the degenerate case */
     if (row == curY (tty) && col == curX (tty)) /* already there */
-- 
cgit v1.2.1