texinfo ChangeLog info/infokey.c info/window.c

[Karl Berry]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Karl Berry <karl>       12/07/06 23:55:32

Modified files:
        .              : ChangeLog 
        info           : infokey.c window.c 

Log message:
        avoid "may be used uninitialized" warnings

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1384&r2=1.1385
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/infokey.c?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/info/window.c?cvsroot=texinfo&r1=1.24&r2=1.25

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1384
retrieving revision 1.1385
diff -u -b -r1.1384 -r1.1385
--- ChangeLog   6 Jul 2012 23:10:27 -0000       1.1384
+++ ChangeLog   6 Jul 2012 23:55:31 -0000       1.1385
@@ -1,5 +1,12 @@
 2012-07-06  Karl Berry  <address@hidden>
 
+       Avoid "used uninitialized" warnings from gcc.
+       * info/infokey.c (compile): initialize seqstate.
+       * info/window.c (process_node_text): initialize carried_over_len,
+       carried_over_count, replen.
+       (Not sure if they actually can be used uninitialized, but seems
+       harmless to initialize them and avoid the warnings, anyway.)
+
        * doc/texinfo.tex (@ifcommanddefined, @ifcommandnotdefined): new
        prospective conditionals, not confirmed
        (txicommandconditionals): implicitly @set this variable.

Index: info/infokey.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infokey.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- info/infokey.c      11 Jun 2012 17:54:26 -0000      1.22
+++ info/infokey.c      6 Jul 2012 23:55:32 -0000       1.23
@@ -1,5 +1,5 @@
 /* infokey.c -- compile ~/.infokey to ~/.info.
-   $Id: infokey.c,v 1.22 2012/06/11 17:54:26 karl Exp $
+   $Id: infokey.c,v 1.23 2012/07/06 23:55:32 karl Exp $
 
    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009,
    2010, 2011, 2012
@@ -418,7 +418,7 @@
       octal,
       special_key
     }
-  seqstate;            /* used if state == get_keyseq */
+  seqstate = normal;   /* used if state == get_keyseq */
   char meta = 0;
   char ocnt = 0;       /* used if state == get_keyseq && seqstate == octal */
 

Index: info/window.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/window.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- info/window.c       17 Nov 2011 10:04:59 -0000      1.24
+++ info/window.c       6 Jul 2012 23:55:32 -0000       1.25
@@ -1,8 +1,8 @@
 /* window.c -- windows in Info.
-   $Id: window.c,v 1.24 2011/11/17 10:04:59 gray Exp $
+   $Id: window.c,v 1.25 2012/07/06 23:55:32 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007, 2008, 2011
-   Free Software Foundation, Inc.
+   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004, 2007, 2008,
+   2011, 2012 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -1476,10 +1476,11 @@
        mbi_advance (iter))
     {
       const char *carried_over_ptr;
-      size_t carried_over_len, carried_over_count;
+      size_t carried_over_len = 0;
+      size_t carried_over_count = 0;
       const char *cur_ptr = mbi_cur_ptr (iter);
       size_t cur_len = mb_len (mbi_cur (iter));
-      size_t replen;
+      size_t replen = 0;
       int delim = 0;
       int rc;