r15167 - gnucash/trunk - Drop argv-list-converters.[ch], because its use was removed by r12942

Andreas Köhler andi5 at cvs.gnucash.org
Sat Dec 2 13:03:14 EST 2006


Author: andi5
Date: 2006-12-02 13:03:13 -0500 (Sat, 02 Dec 2006)
New Revision: 15167
Trac: http://svn.gnucash.org/trac/changeset/15167

Removed:
   gnucash/trunk/src/gnome-utils/argv-list-converters.c
   gnucash/trunk/src/gnome-utils/argv-list-converters.h
Modified:
   gnucash/trunk/
   gnucash/trunk/src/gnome-utils/Makefile.am
   gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
Log:
Drop argv-list-converters.[ch], because its use was removed by r12942
when we switched to a more C-based start-up.



Property changes on: gnucash/trunk
___________________________________________________________________
Name: svk:merge
   - 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:941
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13603
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366
   + 3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/branches/swig-redo:802
3889ce50-311e-0410-a464-f059747ec5d1:/local/gnucash/trunk:943
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk:13603
d2ab10a8-8a95-4986-baff-8d511d9f15b2:/local/gnucash/trunk2:13366

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2006-12-02 02:46:30 UTC (rev 15166)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2006-12-02 18:03:13 UTC (rev 15167)
@@ -29,7 +29,6 @@
   QuickFill.c \
   account-quickfill.c \
   cursors.c \
-  argv-list-converters.c \
   dialog-account.c \
   dialog-commodity.c \
   dialog-options.c \
@@ -157,7 +156,6 @@
   window-main-summarybar.h
 
 noinst_HEADERS = \
-  argv-list-converters.h \
   gnc-druid-gnome.h \
   gnc-druid-provider-edge-gnome.h \
   gnc-druid-provider-file-gnome.h \

Deleted: gnucash/trunk/src/gnome-utils/argv-list-converters.c
===================================================================
--- gnucash/trunk/src/gnome-utils/argv-list-converters.c	2006-12-02 02:46:30 UTC (rev 15166)
+++ gnucash/trunk/src/gnome-utils/argv-list-converters.c	2006-12-02 18:03:13 UTC (rev 15167)
@@ -1,126 +0,0 @@
-/********************************************************************\
- * argv-list-converters.c                                           *
- * Copyright (C) 2000 Gnumatic, Inc                                 *
- * Copyright (C) 2000 James LewisMoss                               *
- *                                                                  *
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
-\********************************************************************/
-
-#include "config.h"
-
-#include <glib.h>
-#include <libguile.h>
-
-#include "argv-list-converters.h"
-
-
-char**
-gnc_scheme_list_to_nulltermcharpp(int prelen, const char **prepend, SCM list)
-{
-    SCM next = list;
-    char **ret;
-    int len = 0;
-    int loc;
-
-    if(SCM_CONSP(list))
-    {
-        int i;
-        len = scm_ilength(list) + prelen;
-        ret = g_new(char *, len + 1);
-        ret[len] = NULL;
-        for(i = 0; i < prelen; i++)
-        {
-            ret[i] = g_strdup(prepend[i]);
-        }
-    }
-    else 
-    {
-        return NULL;
-    }
-
-    loc = prelen;
-    while(SCM_CONSP(next)) 
-    {
-        SCM scm_string = SCM_CAR(next);
-        next = SCM_CDR(next);
-        if(SCM_STRINGP(scm_string))
-        {
-	    const gchar *onestr = SCM_STRING_CHARS(scm_string);
-            ret[loc] = g_strdup (onestr);
-        }
-        else
-        {
-            int i;
-
-            for (i = 0; i < loc; i++)
-              g_free (ret[i]);
-            g_free(ret);
-            return NULL;
-        }
-        loc++;
-    }
-
-    return ret;
-}
-
-SCM
-gnc_argvarr_to_scheme_list(int argc, const char** argv)
-{
-    int i;
-    SCM ret = SCM_EOL;
-
-    for(i = 0; i < argc; i++)
-    {
-      ret = scm_cons(scm_makfrom0str(argv[i]), ret);
-    }
-
-    return scm_reverse(ret);
-}
-
-void
-gnc_free_argv(char** argv)
-{
-    char **now = argv;
-
-    if(!argv)
-    {
-        return;
-    }
-    
-    while(*now != 0)
-    {
-        g_free(*now);
-        now++;
-    }
-    g_free(argv);
-}
-
-int
-argv_length(char** nulltermlist)
-{
-    int ret = 0;
-
-    if(!nulltermlist)
-    {
-        return 0;
-    }
-    
-    while(nulltermlist[ret] != 0)
-        ret++;
-    return ret;
-}

Deleted: gnucash/trunk/src/gnome-utils/argv-list-converters.h
===================================================================
--- gnucash/trunk/src/gnome-utils/argv-list-converters.h	2006-12-02 02:46:30 UTC (rev 15166)
+++ gnucash/trunk/src/gnome-utils/argv-list-converters.h	2006-12-02 18:03:13 UTC (rev 15167)
@@ -1,58 +0,0 @@
-/********************************************************************\
- * argv-list-converters.h                                           *
- * Copyright (C) 2000 Gnumatic, Inc                                 *
- * Copyright (C) 2000 James LewisMoss                               *
- *                                                                  *
- * This program is free software; you can redistribute it and/or    *
- * modify it under the terms of the GNU General Public License as   *
- * published by the Free Software Foundation; either version 2 of   *
- * the License, or (at your option) any later version.              *
- *                                                                  *
- * This program is distributed in the hope that it will be useful,  *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of   *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the    *
- * GNU General Public License for more details.                     *
- *                                                                  *
- * You should have received a copy of the GNU General Public License*
- * along with this program; if not, contact:                        *
- *                                                                  *
- * Free Software Foundation           Voice:  +1-617-542-5942       *
- * 51 Franklin Street, Fifth Floor    Fax:    +1-617-542-2652       *
- * Boston, MA  02110-1301,  USA       gnu at gnu.org                   *
-\********************************************************************/
-
-#ifndef ARGV_LIST_CONVERTERS_H
-#define ARGV_LIST_CONVERTERS_H
-
-
-/*
- * This function takes a SCM value.  Determines whether it is a list
- * and whether that list contains only strings and returns a null
- * terminated array of strings (char*'s)
- */
-char** gnc_scheme_list_to_nulltermcharpp(int prelen, const char **prepend,
-                                         SCM list);
-
-
-/*
- * This function takes a length and char** and makes a scheme list
- * with similar contents
- */
-SCM gnc_argvarr_to_scheme_list(int argc, const char** argv);
-
-/*
- * Frees the strings and the argv array
- */
-void gnc_free_argv(char** argv);
-
-/*
- * print out the argv array in a nice manner
- */
-void print_argv(char **argv);
-
-/*
- * get the length of null terminated char* array
- */
-int argv_length(char** nulltermlist);
-
-#endif

Modified: gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c
===================================================================
--- gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c	2006-12-02 02:46:30 UTC (rev 15166)
+++ gnucash/trunk/src/gnome-utils/gnc-gnome-utils.c	2006-12-02 18:03:13 UTC (rev 15167)
@@ -33,7 +33,6 @@
 
 #include "gnc-html-graph-gog.h"
 
-#include "argv-list-converters.h"
 #include "druid-gconf-setup.h"
 #include "gnc-gconf-utils.h"
 #include "gnc-gnome-utils.h"



More information about the gnucash-changes mailing list