[Groff-commit] groff ChangeLog src/devices/xditview/Makefile.s...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     12/03/10 09:16:02

Modified files:
        .              : ChangeLog 
        src/devices/xditview: Makefile.sub 
        src/preproc/grn: main.cpp 
        src/preproc/html: pre-html.cpp 
        src/roff/troff : number.cpp 

Log message:
        Fix compiler warnings.
        
        * src/preproc/html/pre-html.cpp (alterDeviceTo): Avoid ambiguous
        if-else clause.
        
        * src/preproc/grn/main.cpp (sccsid): Comment out.
        
        * src/roff/troff/number.cpp (parse_expr) <case '*'>: Add cast.
        
        * src/devices/xditview/Makefile.sub (EXTRA_CFLAGS): Add `-Dlint' so
        that unused static ID arrays don't cause a warning.
        
        (Some) problems reported by Bjarni Ingi Gislason
        <address@hidden>.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1331&r2=1.1332
http://cvs.savannah.gnu.org/viewcvs/groff/src/devices/xditview/Makefile.sub?cvsroot=groff&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/grn/main.cpp?cvsroot=groff&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/html/pre-html.cpp?cvsroot=groff&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/groff/src/roff/troff/number.cpp?cvsroot=groff&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1331
retrieving revision 1.1332
diff -u -b -r1.1331 -r1.1332
--- ChangeLog   5 Mar 2012 05:38:38 -0000       1.1331
+++ ChangeLog   10 Mar 2012 09:16:01 -0000      1.1332
@@ -1,3 +1,20 @@
+2012-03-10  Werner LEMBERG  <address@hidden>
+
+       Fix compiler warnings.
+
+       * src/preproc/html/pre-html.cpp (alterDeviceTo): Avoid ambiguous
+       if-else clause.
+
+       * src/preproc/grn/main.cpp (sccsid): Comment out.
+
+       * src/roff/troff/number.cpp (parse_expr) <case '*'>: Add cast.
+
+       * src/devices/xditview/Makefile.sub (EXTRA_CFLAGS): Add `-Dlint' so
+       that unused static ID arrays don't cause a warning.
+
+       (Some) problems reported by Bjarni Ingi Gislason
+       <address@hidden>.
+
 2012-03-05  Werner LEMBERG  <address@hidden>
 
        * tmac/an-ext.tmac (SY): Handle argument with spaces correctly.

Index: src/devices/xditview/Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/src/devices/xditview/Makefile.sub,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/devices/xditview/Makefile.sub   12 Jun 2007 06:58:47 -0000      1.6
+++ src/devices/xditview/Makefile.sub   10 Mar 2012 09:16:01 -0000      1.7
@@ -2,7 +2,7 @@
 MAN1=gxditview.n
 MLIB=$(LIBM)
 XLIBS=$(LIBXUTIL)
-EXTRA_CFLAGS=$(X_CFLAGS)
+EXTRA_CFLAGS=$(X_CFLAGS) -Dlint
 EXTRA_LDFLAGS=$(X_LIBS) $(X_PRE_LIBS) -lXaw -lXmu -lXt -lX11 $(X_EXTRA_LIBS)
 OBJS=\
   device.$(OBJEXT) \

Index: src/preproc/grn/main.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/grn/main.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/preproc/grn/main.cpp    26 Jan 2006 15:15:00 -0000      1.6
+++ src/preproc/grn/main.cpp    10 Mar 2012 09:16:01 -0000      1.7
@@ -119,7 +119,7 @@
 #define BIG    999999999999.0  /* unweildly large floating number */
 
 
-static char sccsid[] = "@(#) (Berkeley) 8/5/85, 12/28/99";
+/* static char sccsid[] = "@(#) (Berkeley) 8/5/85, 12/28/99"; */
 
 int res;                       /* the printer's resolution goes here */
 

Index: src/preproc/html/pre-html.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/html/pre-html.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- src/preproc/html/pre-html.cpp       5 Jan 2009 20:11:07 -0000       1.19
+++ src/preproc/html/pre-html.cpp       10 Mar 2012 09:16:01 -0000      1.20
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2009
+/* Copyright (C) 2000-2004, 2007-2009, 2012
  *     Free Software Foundation, Inc.
  * Written by Gaius Mulley (address@hidden).
  *
@@ -1205,11 +1205,12 @@
   }
   else {
     while (i < argc) {
-      if (strcmp(argv[i], IMAGE_DEVICE) == 0)
+      if (strcmp(argv[i], IMAGE_DEVICE) == 0) {
        if (dialect == xhtml)
          argv[i] = (char *)"-Txhtml";
        else
          argv[i] = (char *)"-Thtml";
+      }
       i++;
     }
     argv[troff_arg] = (char *)"groff"; /* use groff -Z */

Index: src/roff/troff/number.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/roff/troff/number.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/roff/troff/number.cpp   5 Jan 2009 20:11:13 -0000       1.6
+++ src/roff/troff/number.cpp   10 Mar 2012 09:16:02 -0000      1.7
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2004, 2009
+/* Copyright (C) 1989-1992, 2001, 2002, 2004, 2009, 2012
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -355,7 +355,7 @@
     case '*':
       if (v2 < 0) {
        if (*v > 0) {
-         if (*v > -(unsigned)INT_MIN / -(unsigned)v2)
+         if ((unsigned)*v > -(unsigned)INT_MIN / -(unsigned)v2)
            overflow = 1;
        }
        else if (-(unsigned)*v > INT_MAX / -(unsigned)v2)