[Antiright-devel] antiright gtkshell/callbacks.c gtkshell/geometr...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/02/24 00:05:26

Modified files:
        gtkshell       : callbacks.c geometry.c 
        libantiright   : library.h 

Log message:
        Changed use of asprintf to ar_asprintf.  Parenthesized AR[BP]BOOL 
macros.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/geometry.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.8&r2=1.9

Patches:
Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- gtkshell/callbacks.c        23 Feb 2007 03:11:52 -0000      1.10
+++ gtkshell/callbacks.c        24 Feb 2007 00:05:26 -0000      1.11
@@ -30,9 +30,7 @@
   ARBUG("gsh_test_exit()");
 #endif /* DEBUG */
 
-       /* Seemingly redundant check is performed 
-        * as gboolean is not native type.  */
-  if ((gsh != NULL) && (gsh->flags.button_exits == TRUE))
+  if (ARPBOOL (gsh) && ARBBOOL (gsh->flags.button_exits))
     exit (EXIT_SUCCESS);
 
 #ifdef DEBUG
@@ -52,16 +50,11 @@
 
   UNUSED (widget);
 
-  g_assert(cb);
-       if(cb != NULL)
+       ARWIFNP(cb)
                {
                (void)antiright_system (cb->data);
                gsh_test_exit (cb->gsh);
                }
-       else
-               {
-                       ARWARN("callback NULL");
-               }
 }
 
 void

Index: gtkshell/geometry.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/geometry.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/geometry.c 23 Feb 2007 03:11:52 -0000      1.8
+++ gtkshell/geometry.c 24 Feb 2007 00:05:26 -0000      1.9
@@ -39,10 +39,10 @@
 {
   gboolean geometry_status = FALSE;
 
-  if (!gsh->geometry && !gsh->flags.dont_scroll)
-    asprintf (&gsh->geometry, "400x300");
+       if(!ARPBOOL (gsh->geometry) && !ARBBOOL(gsh->flags.dont_scroll))
+                       ar_asprintf (&gsh->geometry, "400x267");
 
-  if (gsh->geometry)
+       ARIFP (gsh->geometry)
     geometry_status = TRUE;
 
   return geometry_status;

Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libantiright/library.h      23 Feb 2007 03:11:52 -0000      1.8
+++ libantiright/library.h      24 Feb 2007 00:05:26 -0000      1.9
@@ -47,8 +47,8 @@
 #define ARERR(message) \
        g_error(ARBUGPARAM(message))
 
-#define ARBBOOL(x) x == TRUE
-#define ARPBOOL(x) x != NULL
+#define ARBBOOL(x) (x == TRUE)
+#define ARPBOOL(x) (x != NULL)
 
 #define ARASSERT g_assert
 
@@ -62,13 +62,13 @@
        if(ARBBOOL(x))
 
 #define ARIFNB(x) \
-       if(!(ARBBOOL(x)))
+       if(!ARBBOOL(x))
 
 #define ARIFP(x) \
        if(ARPBOOL(x))
 
 #define ARIFNP(x) \
-       if(!(ARPBOOL(x)))
+       if(!ARPBOOL(x))
 
 #define ARWIFNP(x) \
        ARIFNP(x) \