[Antiright-devel] antiright configure gtkshell/Makefile gtkshell/...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/03/09 20:00:29

Modified files:
        .              : configure 
        gtkshell       : Makefile arguments.c gtkshell.c gtkshell.h 

Log message:
        Fixed Splint Makefile target to disable warnings resulting only from use
        of GTK.  Fixed splint parse errors.  Changed version in configure.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/Makefile?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.23&r2=1.24

Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- configure   7 Mar 2007 06:44:47 -0000       1.82
+++ configure   9 Mar 2007 20:00:29 -0000       1.83
@@ -25,7 +25,7 @@
 #
 ###############################################################################
 
-VERSION=3.99.0
+VERSION=CURRENT
 
 USE_DISTCC=YES
 USE_CCACHE=YES

Index: gtkshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/Makefile   7 Mar 2007 06:44:47 -0000       1.10
+++ gtkshell/Makefile   9 Mar 2007 20:00:29 -0000       1.11
@@ -48,8 +48,8 @@
        $(CC) -o gtkshell $(objects) main.o $(LDFLAGS)
        ar rcs libgtkshell.a $(objects)
 
-lint: $(sources)
-       splint `pkg-config --cflags-only-I gtk+-2.0` $(sources) > lint.out
+splint: $(sources)
+       splint +posixlib -nullpass -nullstate -temptrans -mustfreeonly 
`pkg-config --cflags-only-I gtk+-2.0` $(sources) > splint.out
 
 clean:
        rm -f gtkshell *.o libgtkshell.a

Index: gtkshell/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gtkshell/arguments.c        8 Mar 2007 06:07:52 -0000       1.14
+++ gtkshell/arguments.c        9 Mar 2007 20:00:29 -0000       1.15
@@ -28,9 +28,9 @@
 static void
 new_button(struct GSH * gsh, gchar * string)
 {
-       gchar **pair;
+       /address@hidden@*/ gchar **pair;
 
-       /address@hidden@*/pair=g_strsplit(string, ",", 2);
+       pair=g_strsplit(string, ",", 2);
 
 
        if(ARPBOOL(pair[0]) && ARPBOOL(pair[1]))
@@ -38,17 +38,17 @@
                gchar * command;
                gint return_value;
 
-               
return_value=ar_asprintf(/address@hidden@*//address@hidden@*/&command, 
+               return_value=ar_asprintf(&command, 
                                         "%s", pair[0]);
                if(return_value != -1)
-                       gsh_image_button(gsh, /address@hidden@*/command, 
pair[1]);
+                       gsh_image_button(gsh, command, pair[1]);
                else
                        ARWARN("cannot create button");
        }
        else
                gsh_command_button(gsh, string);
 
-       g_strfreev(/address@hidden@*/pair);
+       g_strfreev(pair);
 }
 
 static void
@@ -82,10 +82,7 @@
 
        event_button=(GdkEventButton *)event;
        gtk_menu_popup(GTK_MENU(widget), 
-               /address@hidden@*/NULL, 
-               /address@hidden@*/NULL, 
-               /address@hidden@*/NULL, 
-               /address@hidden@*/NULL, 
+               NULL, NULL, NULL, NULL, 
                event_button->button, event_button->time);
 
        return TRUE;

Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtkshell/gtkshell.c 8 Mar 2007 06:07:52 -0000       1.21
+++ gtkshell/gtkshell.c 9 Mar 2007 20:00:29 -0000       1.22
@@ -27,7 +27,7 @@
 setup_quit_signal(GtkWidget * window, const gchar * signal)
 {
        (void) g_signal_connect(window, signal, 
-                       G_CALLBACK(gtk_main_quit), /address@hidden@*/NULL);
+                       G_CALLBACK(gtk_main_quit), NULL);
 }
 
 static void
@@ -61,12 +61,12 @@
        update->period = 1000;
 
        /* Pointer must have not previously been used.  */
-       /address@hidden@*/update->list = (GSList *)/address@hidden@*/NULL;
+       update->list = (GSList *) NULL;
 }
 void
 gsh_GSH(struct GSH * gsh)
 {
-       /address@hidden@*/gsh->geometry = (gchar *)/address@hidden@*/NULL;
+       gsh->geometry = (gchar *)NULL;
        gsh->bflags=0;
        gsh_GSH_Rows(&gsh->rows);
        gsh_GSH_Updater(&gsh->update);
@@ -96,7 +96,7 @@
 {
        gtk_init(argc, argv);
        gsh_GSH(gsh);
-       /address@hidden@*/gsh->window = 
/address@hidden@*/gsh_create_main_window();
+       gsh->window = gsh_create_main_window();
 }
 
 

Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gtkshell/gtkshell.h 7 Mar 2007 06:44:47 -0000       1.23
+++ gtkshell/gtkshell.h 9 Mar 2007 20:00:29 -0000       1.24
@@ -40,7 +40,7 @@
 struct GSH_Updater
 {
        unsigned int period;
-       GSList *list;
+       /address@hidden@*/ GSList *list;
 };
 
 #define GSH_NONE               0
@@ -59,7 +59,7 @@
        struct GSH_Rows rows;
        struct GSH_Updater update;
        GtkWidget *button;
-       gchar *geometry;
+       /address@hidden@*/ gchar *geometry;
        guint bflags;
 };