[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

gEDA-cvs: gaf.git: branch: master updated (1.7.0-20110116-155-g971d122)



The branch, master has been updated
       via  971d122c1c17189dbf33d0d92de3cefb27fc0b97 (commit)
       via  eddb9a7f7a6852a46db1ed0ff6a5c74516ff664a (commit)
       via  3a1cb7a8c532c32138b2f5b39d2ca49fcbd3bd31 (commit)
       via  407210c4c308f6c71004971a33c758b5e235e6de (commit)
       via  1139c095be36fd5041875917aaf3c972335de1f2 (commit)
       via  8cc6911684a66ba4c8bfebc5407d0f917578d6e1 (commit)
       via  8dcbaf1a2356acafd4b6f4247f1c6f426cf1247f (commit)
       via  8de0484eca09833aec9994cd89c3c7111ecfede3 (commit)
       via  8e5d7e4b969d7ce70530ad0c693218fce6a178a4 (commit)
      from  4af6da495fd9233bfcf002d9addf9c36fe5d9751 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gattrib/src/g_rc.c       |   22 +++++++++++++---------
 gnetlist/src/g_netlist.c |   22 ++++++++++++++++------
 gnetlist/src/g_rc.c      |   39 ++++++++++++++++++++++++++++-----------
 gnetlist/src/s_rename.c  |    4 +++-
 gnetlist/src/vams_misc.c |    4 +++-
 gsymcheck/src/g_rc.c     |   22 +++++++++++++---------
 utils/gschlas/g_rc.c     |   18 +++++++++++-------
 7 files changed, 87 insertions(+), 44 deletions(-)


=================
 Commit Messages
=================

commit 971d122c1c17189dbf33d0d92de3cefb27fc0b97
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: remove remaining use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 fefc802... 3114e04... M	gnetlist/src/g_rc.c
:100644 100644 149a1e1... 15ef351... M	gnetlist/src/s_rename.c
:100644 100644 75a6f9a... f5f862c... M	gnetlist/src/vams_misc.c

commit eddb9a7f7a6852a46db1ed0ff6a5c74516ff664a
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_rc_gnetlist_version: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 2185ebc... fefc802... M	gnetlist/src/g_rc.c

commit 3a1cb7a8c532c32138b2f5b39d2ca49fcbd3bd31
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_get_toplevel_attribute: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 ad3e9b0... fb41a8e... M	gnetlist/src/g_netlist.c

commit 407210c4c308f6c71004971a33c758b5e235e6de
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_get_pins_nets: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 55023f0... ad3e9b0... M	gnetlist/src/g_netlist.c

commit 1139c095be36fd5041875917aaf3c972335de1f2
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_get_all_connections: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 fb1d4e6... 55023f0... M	gnetlist/src/g_netlist.c

commit 8cc6911684a66ba4c8bfebc5407d0f917578d6e1
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_get_pins: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 d150f4b... fb1d4e6... M	gnetlist/src/g_netlist.c

commit 8dcbaf1a2356acafd4b6f4247f1c6f426cf1247f
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschlas: g_rc_gschlas_version: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 6dfeb03... 3bfd3c5... M	utils/gschlas/g_rc.c

commit 8de0484eca09833aec9994cd89c3c7111ecfede3
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gsymcheck: g_rc_gsymcheck_version: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 933b3cb... ffc4145... M	gsymcheck/src/g_rc.c

commit 8e5d7e4b969d7ce70530ad0c693218fce6a178a4
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gattrib: g_rc_gattrib_version: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

:100644 100644 cf959c3... f96d47f... M	gattrib/src/g_rc.c

=========
 Changes
=========

commit 971d122c1c17189dbf33d0d92de3cefb27fc0b97
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: remove remaining use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gnetlist/src/g_rc.c b/gnetlist/src/g_rc.c
index fefc802..3114e04 100644
--- a/gnetlist/src/g_rc.c
+++ b/gnetlist/src/g_rc.c
@@ -127,6 +127,17 @@ SCM g_rc_hierarchy_netattrib_mangle(SCM mode)
                    default_hierarchy_netattrib_mangle, 2);
 }
 
+static char *
+g_strdup_scm_string(SCM scm_s)
+{
+  char *s, *ret;
+
+  s = scm_to_utf8_string (scm_s);
+  ret = g_strdup (s);
+  free (s);
+  return ret;
+}
+
 SCM g_rc_hierarchy_netname_separator(SCM name)
 {
   SCM_ASSERT (scm_is_string (name), name,
@@ -134,7 +145,7 @@ SCM g_rc_hierarchy_netname_separator(SCM name)
 
   g_free(default_hierarchy_netname_separator);
 
-  default_hierarchy_netname_separator = g_strdup (SCM_STRING_CHARS (name));
+  default_hierarchy_netname_separator = g_strdup_scm_string (name);
 
   return SCM_BOOL_T;
 }
@@ -146,7 +157,7 @@ SCM g_rc_hierarchy_netattrib_separator(SCM name)
 
   g_free(default_hierarchy_netattrib_separator);
 
-  default_hierarchy_netattrib_separator = g_strdup (SCM_STRING_CHARS (name));
+  default_hierarchy_netattrib_separator = g_strdup_scm_string (name);
 
   return SCM_BOOL_T;
 }
@@ -158,7 +169,7 @@ SCM g_rc_hierarchy_uref_separator(SCM name)
 
   g_free(default_hierarchy_uref_separator);
 
-  default_hierarchy_uref_separator = g_strdup (SCM_STRING_CHARS (name));
+  default_hierarchy_uref_separator = g_strdup_scm_string (name);
 
   return SCM_BOOL_T;
 }
@@ -203,7 +214,7 @@ SCM g_rc_unnamed_netname(SCM name)
 
   g_free(default_unnamed_netname);
 
-  default_unnamed_netname = g_strdup (SCM_STRING_CHARS (name));
+  default_unnamed_netname = g_strdup_scm_string (name);
 
   return SCM_BOOL_T;
 }
@@ -215,7 +226,7 @@ SCM g_rc_unnamed_busname(SCM name)
 
   g_free(default_unnamed_busname);
 
-  default_unnamed_busname = g_strdup (SCM_STRING_CHARS (name));
+  default_unnamed_busname = g_strdup_scm_string (name);
 
   return SCM_BOOL_T;
 }
diff --git a/gnetlist/src/s_rename.c b/gnetlist/src/s_rename.c
index 149a1e1..15ef351 100644
--- a/gnetlist/src/s_rename.c
+++ b/gnetlist/src/s_rename.c
@@ -318,7 +318,7 @@ SCM g_get_renamed_nets(SCM scm_level)
     RENAME * temp_rename;
     char *level;
 
-    level = SCM_STRING_CHARS (scm_level);
+    level = scm_to_utf8_string (scm_level);
 
     for (temp_set = first_set; temp_set; temp_set = temp_set->next_set)
     {
@@ -330,5 +330,7 @@ SCM g_get_renamed_nets(SCM scm_level)
             outerlist = scm_cons (pairlist, outerlist);
         }
     }
+
+    free (level);
     return (outerlist);
 }
diff --git a/gnetlist/src/vams_misc.c b/gnetlist/src/vams_misc.c
index 75a6f9a..f5f862c 100644
--- a/gnetlist/src/vams_misc.c
+++ b/gnetlist/src/vams_misc.c
@@ -76,7 +76,7 @@ vams_get_package_attributes(SCM scm_uref)
   SCM_ASSERT(scm_is_string (scm_uref), scm_uref, SCM_ARG1,
              "gnetlist:vams-get-package-attributes");
 
-  uref = SCM_STRING_CHARS (scm_uref);
+  uref = scm_to_utf8_string (scm_uref);
 
   /* here is where you make it multi page aware */
   nl_current = netlist_head;
@@ -87,10 +87,12 @@ vams_get_package_attributes(SCM scm_uref)
 
     if (nl_current->component_uref &&
         strcmp(nl_current->component_uref, uref) == 0) {
+      free (uref);
       return vams_get_attribs_list (nl_current->object_ptr);
     }
     nl_current = nl_current->next;
   }
 
+  free (uref);
   return SCM_EOL;
 }

commit eddb9a7f7a6852a46db1ed0ff6a5c74516ff664a
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_rc_gnetlist_version: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gnetlist/src/g_rc.c b/gnetlist/src/g_rc.c
index 2185ebc..fefc802 100644
--- a/gnetlist/src/g_rc.c
+++ b/gnetlist/src/g_rc.c
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <missing.h>
 #include <version.h>
 
 #include <stdio.h>
@@ -44,25 +45,30 @@
 #include <dmalloc.h>
 #endif
 
-SCM g_rc_gnetlist_version(SCM version)
+SCM g_rc_gnetlist_version(SCM scm_version)
 {
-  SCM_ASSERT (scm_is_string (version), version,
+  char *version;
+  SCM ret = SCM_BOOL_T;
+
+  SCM_ASSERT (scm_is_string (scm_version), scm_version,
               SCM_ARG1, "gnetlist-version");
 
-  if (strcmp (SCM_STRING_CHARS (version), PACKAGE_DATE_VERSION) != 0) {
+  version = scm_to_utf8_string (scm_version);
+  if (strcmp (version, PACKAGE_DATE_VERSION) != 0) {
     fprintf(stderr,
 	    "You are running gEDA/gaf version [%s%s.%s],\n", 
             PREPEND_VERSION_STRING, PACKAGE_DOTTED_VERSION,
             PACKAGE_DATE_VERSION);
     fprintf(stderr,
 	    "but you have a version [%s] gnetlistrc file:\n[%s]\n",
-	    SCM_STRING_CHARS (version), rc_filename);
+	    version, rc_filename);
     fprintf(stderr,
 	    "Please be sure that you have the latest rc file.\n");
-    return SCM_BOOL_F;
+    ret = SCM_BOOL_F;
   }
 
-  return SCM_BOOL_T;
+  free (version);
+  return ret;
 }
 
 

commit 3a1cb7a8c532c32138b2f5b39d2ca49fcbd3bd31
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_get_toplevel_attribute: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gnetlist/src/g_netlist.c b/gnetlist/src/g_netlist.c
index ad3e9b0..fb41a8e 100644
--- a/gnetlist/src/g_netlist.c
+++ b/gnetlist/src/g_netlist.c
@@ -711,7 +711,7 @@ SCM g_get_toplevel_attribute(SCM scm_wanted_attrib)
   SCM_ASSERT(scm_is_string (scm_wanted_attrib),
              scm_wanted_attrib, SCM_ARG1, "gnetlist:get-toplevel-attribute");
 
-  wanted_attrib = SCM_STRING_CHARS (scm_wanted_attrib);
+  wanted_attrib = scm_to_utf8_string (scm_wanted_attrib);
 
   for (p_iter = geda_list_get_glist (project_current->pages); p_iter != NULL;
        p_iter = g_list_next (p_iter)) {
@@ -727,6 +727,8 @@ SCM g_get_toplevel_attribute(SCM scm_wanted_attrib)
       break;
   }
 
+  free (wanted_attrib);
+
   if (attrib_value != NULL) {
     scm_return_value = scm_from_utf8_string (attrib_value);
     g_free (attrib_value);

commit 407210c4c308f6c71004971a33c758b5e235e6de
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_get_pins_nets: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gnetlist/src/g_netlist.c b/gnetlist/src/g_netlist.c
index 55023f0..ad3e9b0 100644
--- a/gnetlist/src/g_netlist.c
+++ b/gnetlist/src/g_netlist.c
@@ -441,7 +441,7 @@ SCM g_get_pins_nets(SCM scm_uref)
     SCM_ASSERT(scm_is_string (scm_uref),
 	       scm_uref, SCM_ARG1, "gnetlist:get-pins-nets");
 
-    wanted_uref = SCM_STRING_CHARS (scm_uref);
+    wanted_uref = scm_to_utf8_string (scm_uref);
 
     /* search for the any instances */
     /* through the entire list */
@@ -473,6 +473,8 @@ SCM g_get_pins_nets(SCM scm_uref)
 	}
     }
 
+    free (wanted_uref);
+
     pinslist = scm_reverse (pinslist);	/* pins are in reverse order on the way 
 					 * out 
 					 */

commit 1139c095be36fd5041875917aaf3c972335de1f2
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_get_all_connections: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gnetlist/src/g_netlist.c b/gnetlist/src/g_netlist.c
index fb1d4e6..55023f0 100644
--- a/gnetlist/src/g_netlist.c
+++ b/gnetlist/src/g_netlist.c
@@ -253,7 +253,7 @@ SCM g_get_all_connections(SCM scm_netname)
     SCM_ASSERT(scm_is_string(scm_netname), scm_netname, SCM_ARG1, 
 	       "gnetlist:get-all-connections");
 
-    wanted_net_name = SCM_STRING_CHARS (scm_netname);
+    wanted_net_name = scm_to_utf8_string (scm_netname);
 
     if (wanted_net_name == NULL) {
 	return list;
@@ -320,6 +320,7 @@ SCM g_get_all_connections(SCM scm_netname)
 	nl_current = nl_current->next;
     }
 
+    free (wanted_net_name);
     return connlist;
 }
 

commit 8cc6911684a66ba4c8bfebc5407d0f917578d6e1
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gnetlist: g_get_pins: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gnetlist/src/g_netlist.c b/gnetlist/src/g_netlist.c
index d150f4b..fb1d4e6 100644
--- a/gnetlist/src/g_netlist.c
+++ b/gnetlist/src/g_netlist.c
@@ -108,13 +108,16 @@ SCM g_get_non_unique_packages(SCM level)
 }
 
 
-SCM g_get_pins(SCM uref)
+SCM g_get_pins(SCM scm_uref)
 {
+    char *uref;
     SCM list = SCM_EOL;
     NETLIST *nl_current;
     CPINLIST *pl_current;
 
-    SCM_ASSERT(scm_is_string (uref), uref, SCM_ARG1, "gnetlist:get-pins");
+    SCM_ASSERT(scm_is_string (scm_uref), scm_uref, SCM_ARG1, "gnetlist:get-pins");
+
+    uref = scm_to_utf8_string (scm_uref);
 
     /* here is where you make it multi page aware */
     nl_current = netlist_head;
@@ -124,7 +127,7 @@ SCM g_get_pins(SCM uref)
     while (nl_current != NULL) {
 
 	if (nl_current->component_uref) {
-	    if (strcmp(nl_current->component_uref, SCM_STRING_CHARS (uref)) == 0) {
+	    if (strcmp(nl_current->component_uref, uref) == 0) {
 
 		pl_current = nl_current->cpins;
 		while (pl_current != NULL) {
@@ -139,6 +142,8 @@ SCM g_get_pins(SCM uref)
 	nl_current = nl_current->next;
     }
 
+    free (uref);
+
     return (list);
 }
 

commit 8dcbaf1a2356acafd4b6f4247f1c6f426cf1247f
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gschlas: g_rc_gschlas_version: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/utils/gschlas/g_rc.c b/utils/gschlas/g_rc.c
index 6dfeb03..3bfd3c5 100644
--- a/utils/gschlas/g_rc.c
+++ b/utils/gschlas/g_rc.c
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <missing.h>
 #include <version.h>
 
 #include <stdio.h>
@@ -44,27 +45,30 @@
 #include <dmalloc.h>
 #endif
 
-SCM g_rc_gschlas_version(SCM version)
+SCM g_rc_gschlas_version(SCM scm_version)
 {
+    char *version;
+    SCM ret = SCM_BOOL_T;
 
-    SCM_ASSERT (scm_is_string (version), version,
+    SCM_ASSERT (scm_is_string (scm_version), scm_version,
 		SCM_ARG1, "gschlas-version");
 
-
-    if (g_strcasecmp (SCM_STRING_CHARS (version), PACKAGE_DATE_VERSION) != 0) {
+    version = scm_to_utf8_string (scm_version);
+    if (g_strcasecmp (version, PACKAGE_DATE_VERSION) != 0) {
       fprintf(stderr,
               "You are running gEDA/gaf version [%s%s.%s],\n",
               PREPEND_VERSION_STRING, PACKAGE_DOTTED_VERSION,
               PACKAGE_DATE_VERSION);
       fprintf(stderr,
               "but you have a version [%s] gschlasrc file:\n[%s]\n",
-              SCM_STRING_CHARS (version), rc_filename);
+              version, rc_filename);
       fprintf(stderr,
               "Please be sure that you have the latest rc file.\n");
-      return SCM_BOOL_F;
+      ret = SCM_BOOL_F;
     }
 
-    return SCM_BOOL_T;
+    free (version);
+    return ret;
 }
 
 

commit 8de0484eca09833aec9994cd89c3c7111ecfede3
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gsymcheck: g_rc_gsymcheck_version: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gsymcheck/src/g_rc.c b/gsymcheck/src/g_rc.c
index 933b3cb..ffc4145 100644
--- a/gsymcheck/src/g_rc.c
+++ b/gsymcheck/src/g_rc.c
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <missing.h>
 #include <version.h>
 
 #include <stdio.h>
@@ -41,26 +42,29 @@
 #include "../include/i_vars.h"
 #include "../include/prototype.h"
 
-SCM g_rc_gsymcheck_version(SCM version)
+SCM g_rc_gsymcheck_version(SCM scm_version)
 {
-  SCM_ASSERT (scm_is_string (version), version,
+  char *version;
+  SCM ret = SCM_BOOL_T;
+
+  SCM_ASSERT (scm_is_string (scm_version), scm_version,
 	      SCM_ARG1, "gsymcheck-version");
-  
-  if (g_strcasecmp (SCM_STRING_CHARS (version), PACKAGE_DATE_VERSION) != 0) {
+
+  version = scm_to_utf8_string (scm_version);
+  if (g_strcasecmp (version, PACKAGE_DATE_VERSION) != 0) {
     fprintf(stderr,
             "You are running gEDA/gaf version [%s%s.%s],\n",
             PREPEND_VERSION_STRING, PACKAGE_DOTTED_VERSION, PACKAGE_DATE_VERSION);
     fprintf(stderr,
             "but you have a version [%s] gsymcheckrc file:\n[%s]\n",
-            SCM_STRING_CHARS (version), rc_filename);
+            version, rc_filename);
     fprintf(stderr,
             "Please be sure that you have the latest rc file.\n");
-    return SCM_BOOL_F;
-
+    ret = SCM_BOOL_F;
   }
-  
-  return SCM_BOOL_T;
 
+  free (version);
+  return ret;
 }
 
 /*************************** GUILE end done *********************************/

commit 8e5d7e4b969d7ce70530ad0c693218fce6a178a4
Author: Ivan Stankovic <pokemon@xxxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>

    gattrib: g_rc_gattrib_version: remove use of deprecated SCM_STRING_CHARS
    
    Reviewed-by: Peter TB Brett <peter@xxxxxxxxxxxxx>

diff --git a/gattrib/src/g_rc.c b/gattrib/src/g_rc.c
index cf959c3..f96d47f 100644
--- a/gattrib/src/g_rc.c
+++ b/gattrib/src/g_rc.c
@@ -25,6 +25,7 @@
  */
 
 #include <config.h>
+#include <missing.h>
 #include <version.h>
 
 #include <stdio.h>
@@ -60,27 +61,30 @@
  * \param version Version being tested
  * \returns false if incorrect version, true if OK
  */
-SCM g_rc_gattrib_version(SCM version)
+SCM g_rc_gattrib_version(SCM scm_version)
 {
-  SCM_ASSERT (scm_is_string (version), version,
+  char *version;
+  SCM ret = SCM_BOOL_T;
+
+  SCM_ASSERT (scm_is_string (scm_version), scm_version,
 	      SCM_ARG1, "gattrib-version");
-  
-  if (g_strcasecmp (SCM_STRING_CHARS (version),
-                    PACKAGE_DATE_VERSION) != 0) {
+
+  version = scm_to_utf8_string (scm_version);
+  if (g_strcasecmp (version, PACKAGE_DATE_VERSION) != 0) {
     fprintf(stderr,
             "You are running gEDA/gaf version [%s%s.%s],\n",
             PREPEND_VERSION_STRING, PACKAGE_DOTTED_VERSION,
             PACKAGE_DATE_VERSION);
     fprintf(stderr,
             "but you have a version [%s] gattribrc file.\n",
-            SCM_STRING_CHARS (version));
+            version);
     fprintf(stderr,
             "Please be sure that you have the latest rc file.\n");
-    return SCM_BOOL_F;
+    ret = SCM_BOOL_F;
   }
-  
-  return SCM_BOOL_T;
 
+  free (version);
+  return ret;
 }
 
 




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs