[Antiright-devel] antiright gtkshell/guidl_util.c gtkshell/guidl_...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/30 18:43:25

Modified files:
        gtkshell       : guidl_util.c guidl_util.h options.c 
        libantiright   : util.c util.h 

Log message:
        Switched ARArguments use to follow antiright class system.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.c?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_util.h?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/options.c?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.c?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/util.h?cvsroot=antiright&r1=1.8&r2=1.9

Patches:
Index: gtkshell/guidl_util.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gtkshell/guidl_util.c       28 Apr 2007 22:26:23 -0000      1.11
+++ gtkshell/guidl_util.c       30 Apr 2007 18:43:25 -0000      1.12
@@ -31,13 +31,13 @@
        ARPASSERT(env);
 #endif /* DEBUG */
        $(env->dictionaries, delete);
-       ar_delete_ARArguments_contents(&(env->args));
+       $(env->args, delete);
 }
 
 static void
 gsh_setup_GDLEnvironment(struct GDLEnvironment * env)
 {
-       ar_setup_ARArguments(&(env->args));
+       env->args=ARNEW(ar, ARArguments);
        env->dictionaries=ARNEW(gsh, GDLDictionaries);
        env->delete=&gsh_delete_GDLEnvironment;
 }
@@ -46,8 +46,10 @@
 gsh_new_GDLEnvironment()
 {
        struct GDLEnvironment * env;
+
        env=(struct GDLEnvironment *)g_malloc(sizeof(struct GDLEnvironment));
        gsh_setup_GDLEnvironment(env);
+
        return env;
 }
 
@@ -62,7 +64,7 @@
 gsh_append_arg(gchar * arg)
 {
        check_gsh_guidl_env();
-       gsh_guidl_env->args.add(&(gsh_guidl_env->args), arg);
+       $(gsh_guidl_env->args, add, arg);
 }
 
 

Index: gtkshell/guidl_util.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_util.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/guidl_util.h       28 Apr 2007 22:26:23 -0000      1.7
+++ gtkshell/guidl_util.h       30 Apr 2007 18:43:25 -0000      1.8
@@ -27,7 +27,7 @@
 struct GDLEnvironment
 {
        struct GDLDictionaries * dictionaries;
-       struct ARArguments args;
+       struct ARArguments *args;
        void (*delete)(struct GDLEnvironment *);
 };
 

Index: gtkshell/options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/options.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gtkshell/options.c  28 Apr 2007 22:26:23 -0000      1.17
+++ gtkshell/options.c  30 Apr 2007 18:43:25 -0000      1.18
@@ -60,10 +60,10 @@
 
        yyparse();
 #ifdef DEBUG
-       print_arguments(gsh_guidl_env->args.argc, gsh_guidl_env->args.argv);
+       print_arguments(gsh_guidl_env->args->argc, gsh_guidl_env->args->argv);
 #endif /* DEBUG */
-       gsh_parse_arguments(gsh, gsh_guidl_env->args.argc, 
-                           gsh_guidl_env->args.argv);
+       gsh_parse_arguments(gsh, gsh_guidl_env->args->argc, 
+                           gsh_guidl_env->args->argv);
        $(gsh_guidl_env, delete);
        gsh_guidl_env=NULL;
 }

Index: libantiright/util.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- libantiright/util.c 28 Apr 2007 22:26:23 -0000      1.12
+++ libantiright/util.c 30 Apr 2007 18:43:25 -0000      1.13
@@ -34,7 +34,22 @@
        return (g_malloc(size));
 }
 
-void
+static void
+ar_delete_ARArguments_contents(struct ARArguments * args)
+{
+       for(; args->argc>0; args->argc--)
+               g_free(args->argv[args->argc-1]);
+       g_free(args->argv);
+}
+
+static void
+ar_delete_ARArguments(struct ARArguments * args)
+{
+       ar_delete_ARArguments_contents(args);
+       g_free(args);
+}
+
+static void
 ar_ARArguments_add(struct ARArguments * this, gchar * item)
 {
        this->argc++;
@@ -42,37 +57,26 @@
        this->argv[this->argc-1]=g_strdup(item);
 }
 
-void
+static void
 ar_setup_ARArguments(struct ARArguments * args)
 {
        args->argc=0;
        args->argv=NULL;
        args->add=&ar_ARArguments_add;
+       args->delete=&ar_delete_ARArguments;
 }
 
 struct ARArguments *
 ar_new_ARArguments()
 {
        struct ARArguments * args;
+
        args=g_malloc(sizeof(struct ARArguments));
        ar_setup_ARArguments(args);
-       return args;
-}
 
-void
-ar_delete_ARArguments_contents(struct ARArguments * args)
-{
-       for(; args->argc>0; args->argc--)
-               g_free(args->argv[args->argc-1]);
-       g_free(args->argv);
+       return args;
 }
 
-void
-ar_delete_ARArguments(struct ARArguments * args)
-{
-       ar_delete_ARArguments_contents(args);
-       g_free(args);
-}
 /*
 void
 rand_seed()

Index: libantiright/util.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/util.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libantiright/util.h 28 Apr 2007 22:26:23 -0000      1.8
+++ libantiright/util.h 30 Apr 2007 18:43:25 -0000      1.9
@@ -29,23 +29,12 @@
        gchar ** argv;
        gint argc;
        void (*add)(struct ARArguments *, gchar *);
+       void (*delete)(struct ARArguments *);
 };
 
-void
-ar_ARArguments_add(struct ARArguments * this, gchar * item);
-
-void
-ar_setup_ARArguments(struct ARArguments * args);
-
 struct ARArguments *
 ar_new_ARArguments();
 
-void
-ar_delete_ARArguments(struct ARArguments * args);
-
-void
-ar_delete_ARArguments_contents(struct ARArguments * args);
-
 /* Decimal bitmasks for boolean storage.  */
 #define ARB_0 1
 #define ARB_1 2