[Antiright-devel] antiright gtkshell/arguments.c gtkshell/button.... [antiright-3]

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Branch:         antiright-3
Changes by:     Jeffrey Bedard <jefbed> 07/03/07 06:28:52

Modified files:
        gtkshell       : arguments.c button.c gtkshell.c gtkshell.h 
        libantiright   : string.h 

Log message:
        Added splint annotations and changed code to fix warnings where 
appropriate.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&only_with_tag=antiright-3&r1=1.12.2.1&r2=1.12.2.2
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&only_with_tag=antiright-3&r1=1.20&r2=1.20.2.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.c?cvsroot=antiright&only_with_tag=antiright-3&r1=1.20&r2=1.20.2.1
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&only_with_tag=antiright-3&r1=1.22.2.1&r2=1.22.2.2
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/string.h?cvsroot=antiright&only_with_tag=antiright-3&r1=1.4&r2=1.4.2.1

Patches:
Index: gtkshell/arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -b -r1.12.2.1 -r1.12.2.2
--- gtkshell/arguments.c        7 Mar 2007 03:58:35 -0000       1.12.2.1
+++ gtkshell/arguments.c        7 Mar 2007 06:28:52 -0000       1.12.2.2
@@ -48,19 +48,28 @@
 static void
 menuitem_parse(struct GSH * gsh, gchar * string)
 {
-       gchar **pair;
-       gchar * command;
+       gchar /address@hidden@*/ **pair;
 
        pair=g_strsplit(string, ",", 2);
 
-       ar_asprintf(&command, "%s", pair[0]);
+       {
+               gchar * /address@hidden@*/ command;
+
+               {
+                       gint read;
+
+                       read=ar_asprintf(/address@hidden@*/&command, "%s", 
pair[0]);
+                       if(read == 0)
+                               ARWARN("NULL command");
+               }
 
        if(ARPBOOL(pair[0]) && ARPBOOL(pair[1]))
                gsh_image_button(gsh, command, pair[1]);
        else
                gsh_command_button(gsh, command);
+       }
 
-       g_strfreev(pair);
+       g_strfreev(/address@hidden/pair);
 }
 
 static gint

Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -b -r1.20 -r1.20.2.1
--- gtkshell/button.c   5 Mar 2007 01:05:42 -0000       1.20
+++ gtkshell/button.c   7 Mar 2007 06:28:52 -0000       1.20.2.1
@@ -17,7 +17,8 @@
 
   You should have received a copy of the GNU General Public License
   along with AntiRight; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  
USA
+  Foundation, Inc., 51 Franklin Street, Fifth Floor, 
+       Boston, MA  02110-1301  USA
 */
 
 #include "gtkshell.h"
@@ -28,7 +29,7 @@
 static void
 create_label_in_menu_item(GtkWidget * widget, char * formatted)
 {
-       GtkWidget * label;
+       /address@hidden@*/GtkWidget * label;
 
        label = gtk_label_new(formatted);
        gtk_container_add(GTK_CONTAINER(widget), label);
@@ -38,7 +39,7 @@
 static void
 setup_label(GtkWidget *widget, char *command)
 {
-       gchar *formatted;
+       /address@hidden/gchar *formatted;
 
        formatted = antiright_beautified_label(command);
 
@@ -47,44 +48,47 @@
        else
                gtk_button_set_label(GTK_BUTTON(widget), formatted);
 
-       free(formatted);
+       g_free(/address@hidden@*//address@hidden/formatted);
 }
 
 static struct GSH_CBData *
 setup_callback_data(struct GSH * gsh, char * command)
 {
-       struct GSH_CBData * cb;
+       /address@hidden@*/struct GSH_CBData * cb;
 
        /* Allocate and initialize elements.  */
-       cb = (struct GSH_CBData *) xmalloc(sizeof(struct GSH_CBData));
+       cb = /address@hidden@*/(struct GSH_CBData *) 
+               xmalloc(sizeof(struct GSH_CBData));
 
        cb->gsh = gsh;
        cb->data = command;     /* command from argv, literal, or
                                 * preallocated
                                 * */
 
-       return cb;
+       return /address@hidden//address@hidden@*/cb;
 }
 
 static void
 setup_callback(struct GSH * gsh, char * command)
 {
-       struct GSH_CBData * cb;
+       /address@hidden@*/struct GSH_CBData * cb;
 
        cb=setup_callback_data(gsh, command);
 
-       if(GTK_IS_MENU_ITEM(gsh->button))
+       ARIFB(GTK_IS_MENU_ITEM(gsh->button))
        {
+               /address@hidden@*/
                (void) g_signal_connect(G_OBJECT(gsh->button), 
                                "activate", G_CALLBACK(system_cb), cb);
 
        }
        else if((gsh->bflags & GSH_MENU_BUTTON) != GSH_MENU_BUTTON)
        {
-               /* @null@ */
+               /address@hidden@*/
                (void) g_signal_connect(G_OBJECT(gsh->button), 
                                "clicked", G_CALLBACK(system_cb), cb);
        }
+       /* If the button launches a menu, do not add a system_cb.  */
        else if((gsh->bflags & GSH_MENU_BUTTON) == GSH_MENU_BUTTON)
                gsh->bflags ^= GSH_MENU_BUTTON;
 
@@ -94,7 +98,12 @@
 create_button(struct GSH * gsh)
 {
        if(!GTK_IS_MENU(gsh->rows.v))
+       {
                gsh->button = gtk_button_new();
+               /* For now, we only do drag 
+                * and drop with regular buttons.  */
+               gsh_setup_drag_drop(gsh, gsh->button);
+       }
        else
                gsh->button = gtk_menu_item_new();
 
@@ -112,7 +121,6 @@
 
        create_button(gsh);
        setup_label(gsh->button, command);
-       gsh_setup_drag_drop(gsh, gsh->button);
        setup_callback(gsh, command);
        gsh_manage_unexpanded(gsh, gsh->button);
 

Index: gtkshell/gtkshell.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.c,v
retrieving revision 1.20
retrieving revision 1.20.2.1
diff -u -b -r1.20 -r1.20.2.1
--- gtkshell/gtkshell.c 2 Mar 2007 16:41:43 -0000       1.20
+++ gtkshell/gtkshell.c 7 Mar 2007 06:28:52 -0000       1.20.2.1
@@ -26,9 +26,8 @@
 static void
 setup_quit_signal(GtkWidget * window, const gchar * signal)
 {
-       /* @null@ */
        (void) g_signal_connect(window, signal, 
-                       G_CALLBACK(gtk_main_quit), NULL);
+                       G_CALLBACK(gtk_main_quit), /address@hidden@*/NULL);
 }
 
 static void
@@ -68,8 +67,7 @@
 void
 gsh_GSH(struct GSH * gsh)
 {
-       /* @null */
-       gsh->geometry = (gchar *) NULL;
+       /* @null */ gsh->geometry = (gchar *) NULL;
        gsh->bflags=0;
        gsh_GSH_Rows(&gsh->rows);
        gsh_GSH_Updater(&gsh->update);
@@ -77,7 +75,7 @@
 struct GSH *
 gsh_new_GSH()
 {
-       struct GSH *gsh;
+       /address@hidden@*/struct GSH *gsh;
 
        gsh = (struct GSH *) xmalloc(sizeof(struct GSH));
        gsh_GSH(gsh);

Index: gtkshell/gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -b -r1.22.2.1 -r1.22.2.2
--- gtkshell/gtkshell.h 7 Mar 2007 03:58:35 -0000       1.22.2.1
+++ gtkshell/gtkshell.h 7 Mar 2007 06:28:52 -0000       1.22.2.2
@@ -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;
 };
 

Index: libantiright/string.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/string.h,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -b -r1.4 -r1.4.2.1
--- libantiright/string.h       28 Feb 2007 03:53:51 -0000      1.4
+++ libantiright/string.h       7 Mar 2007 06:28:52 -0000       1.4.2.1
@@ -23,24 +23,12 @@
 #ifndef LIBAR_STRING_H
 #define LIBAR_STRING_H
 
-gint
-     ar_asprintf(gchar **string, const gchar *format,...);
+/address@hidden@*/gint
+ar_asprintf(gchar **string, 
+           const gchar *format,
+           ...) __attribute__((format(printf,2,3)));
 
 char *
-     antiright_beautified_label(char *current_argument_string);
+antiright_beautified_label(char *current_argument_string);
 
-/* char*      */
-
-/*
- * antiright_insert_string(char *text, char *insertion, unsigned int
- * position);
- */
-/* char* */
-
-/*
- * antiright_delete_range(char *text, unsigned int start, unsigned int
- * end);
- */
-/* char* */
-/* ar_insert_txt(char* source, char* text, unsigned int position); */
 #endif