[Antiright-devel] antiright configure libantiright/util.c libanti...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 10/08/17 19:39:20

Modified files:
        .              : configure 
        libantiright   : util.c util.h 
        xshell         : Makefile 

Log message:
        Add profiling options to debug configuration.  Specify -W by default.
        Simplify definition of armalloc/arfree.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.c?cvsroot=antiright&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.h?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/xshell/Makefile?cvsroot=antiright&r1=1.10&r2=1.11

Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- configure   13 Aug 2010 20:22:20 -0000      1.123
+++ configure   17 Aug 2010 19:39:20 -0000      1.124
@@ -32,7 +32,8 @@
 for ARG in $@; do
        if [ "$ARG" = "-d" ]; then
                echo 'Configuring with debug options...'
-               CFLAGS="-g3 -Wdisabled-optimization -DDEBUG"
+               CFLAGS="-g3 -Wdisabled-optimization -DDEBUG -pg"
+                LDFLAGS="$LDFLAGS -pg"
                CFLAGS="$CFLAGS -Wunreachable-code"
                DEFS="$DEFS -DGC_DEBUG"
                echo -n 'Checking for gdb...'
@@ -59,7 +60,7 @@
 done
 
 # For development branch
-CFLAGS="$CFLAGS -Wall"
+CFLAGS="$CFLAGS -Wall -W"
 
 DEFS="$DEFS -DPACKAGE_STRING='\"AntiRight_$VERSION\"'"
 

Index: libantiright/util.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libantiright/util.c 15 Aug 2010 18:52:34 -0000      1.20
+++ libantiright/util.c 17 Aug 2010 19:39:20 -0000      1.21
@@ -22,34 +22,6 @@
 
 #include "library.h"
 
-gpointer
-armalloc(size_t size)
-{
-       gpointer data;
-
-       /*
-        * There is no need to check for success, as g_malloc causes
-        * the application to terminate on failure.
-        */
-#ifdef LIBGC
-       data=GC_MALLOC(size);
-#else /* not LIBGC */
-       data=g_malloc(size);
-#endif /* LIBGC */
-
-       return data;
-}
-
-void
-arfree(gpointer data)
-{
-#ifdef LIBGC
-       GC_FREE(data);
-#else /* not LIBGC */
-       g_free(data);
-#endif /* LIBGC */
-}
-
 static ARActionFunction
 ar_ARFunctionDictionary_lookup(struct ARFunctionDictionary * dict, 
        const gchar * key)

Index: libantiright/util.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libantiright/util.h 15 Aug 2010 18:52:34 -0000      1.15
+++ libantiright/util.h 17 Aug 2010 19:39:20 -0000      1.16
@@ -26,11 +26,13 @@
 #define AR_TEXT_TO_FILE(filename, text)\
        g_file_set_contents(filename, text, strlen(text), NULL)
 
-gpointer
-armalloc(size_t size);
-
-void
-arfree(gpointer data);
+#ifdef LIBGC
+#define armalloc(size) GC_MALLOC(size);
+#define arfree(data)    GC_FREE(data);
+#else /* not LIBGC */
+#define armalloc(size)  g_malloc(size);
+#define arfree(data)    g_free(data);
+#endif
 
 typedef void(*ARActionFunction)(gint *, gchar **);
 

Index: xshell/Makefile
===================================================================
RCS file: /sources/antiright/antiright/xshell/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- xshell/Makefile     2 Nov 2008 23:36:09 -0000       1.10
+++ xshell/Makefile     17 Aug 2010 19:39:20 -0000      1.11
@@ -32,8 +32,8 @@
 # This is for CYGWIN:
 INCLUDES+=-I/usr/include/freetype2/freetype/config
 
-CFLAGS=$(INCLUDES) 
-CFLAGS+=-Os
+#CFLAGS=$(INCLUDES) $(DEFS)
+CFLAGS+=$(INCLUDES) $(DEFS)
 CFLAGS+=-DXSH_DECORATE
 # For use with patched version of evilwm
 # CFLAGS+=-DEVILWM_HACK_HACK