[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-110-g605ace6)
The branch, master has been updated
via 605ace65a691d3960e258a9b52fa940be3517448 (commit)
via 2b16e530902c2c82e450f6b424eca7c0dbb598a2 (commit)
via 87152abe9c217a34323a9166730cd12e5c7773ca (commit)
via d66220b8d3085c7ab55bac419b125d9287c0520d (commit)
from 6d4ba095d2894e9cc21e272d28af07b0d74a7b99 (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
=========
gnetlist/src/s_traverse.c | 6 ------
gschem/m4/.gitignore | 2 ++
libgeda/m4/.gitignore | 2 ++
libgeda/src/g_smob.c | 13 ++++++++++---
libgeda/src/s_clib.c | 23 ++++++++++++++++++-----
5 files changed, 32 insertions(+), 14 deletions(-)
=================
Commit Messages
=================
commit 605ace65a691d3960e258a9b52fa940be3517448
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Fix DEBUG builds. [2823755]
Fix a bug in s_traverse.c where defining DEBUG broke the build. This
patch simply removes the offending #ifdef'd code.
Thanks to Kai-Martin Knaak for the bug report.
:100644 100644 a23fa34... b5e3694... M gnetlist/src/s_traverse.c
commit 2b16e530902c2c82e450f6b424eca7c0dbb598a2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Fix component library doxygen.
Turn the random pages generated at the toplevel into sections within
the file documentation for `s_clib.c'.
:100644 100644 a537c47... adf8f0e... M libgeda/src/s_clib.c
commit 87152abe9c217a34323a9166730cd12e5c7773ca
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Get rid of some uses of SCM_STRING_CHARS.
SCM_STRING_CHARS is deprecated in Guile 1.8.x.
:100644 100644 cba1682... 6fbc74b... M libgeda/src/g_smob.c
:100644 100644 c18cdc0... a537c47... M libgeda/src/s_clib.c
commit d66220b8d3085c7ab55bac419b125d9287c0520d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Ignore yet more unnecessary m4 files installed by autopoint.
:100644 100644 9b2675b... 37bf6f9... M gschem/m4/.gitignore
:100644 100644 d5d05f6... a67d7b2... M libgeda/m4/.gitignore
=========
Changes
=========
commit 605ace65a691d3960e258a9b52fa940be3517448
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Fix DEBUG builds. [2823755]
Fix a bug in s_traverse.c where defining DEBUG broke the build. This
patch simply removes the offending #ifdef'd code.
Thanks to Kai-Martin Knaak for the bug report.
diff --git a/gnetlist/src/s_traverse.c b/gnetlist/src/s_traverse.c
index a23fa34..b5e3694 100644
--- a/gnetlist/src/s_traverse.c
+++ b/gnetlist/src/s_traverse.c
@@ -422,12 +422,6 @@ NET *s_traverse_net (TOPLEVEL *pr_current, NET *nets, int starting,
if (c_current->other_object != NULL) {
-#if DEBUG
- printf("c_current %s visited: %d\n",
- c_current->other_object->name,
- c_current->other_object->visited);
-#endif
-
if (!is_visited(c_current->other_object) &&
c_current->other_object != object) {
nets = s_traverse_net (pr_current, nets, FALSE,
commit 2b16e530902c2c82e450f6b424eca7c0dbb598a2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Fix component library doxygen.
Turn the random pages generated at the toplevel into sections within
the file documentation for `s_clib.c'.
diff --git a/libgeda/src/s_clib.c b/libgeda/src/s_clib.c
index a537c47..adf8f0e 100644
--- a/libgeda/src/s_clib.c
+++ b/libgeda/src/s_clib.c
@@ -72,7 +72,7 @@
* s_clib_symbol_get_data_by_name().
*
*
- * \page libcmds Library Commands
+ * \section libcmds Library Commands
*
* A program or set of programs can be used as a component source. The procedure used to add such a source from a gEDA rc file is:
*
@@ -92,7 +92,7 @@
* non-zero exit status. Anything it has output on stdout will be
* ignored, and any stderr output displayed to the user.
*
- * \page libscms Library Scheme Procedures
+ * \section libscms Library Scheme Procedures
*
* A set of Scheme procedures can be used as a component source. The
* procedure used to add such a source from a gEDA rc file is:
commit 87152abe9c217a34323a9166730cd12e5c7773ca
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Get rid of some uses of SCM_STRING_CHARS.
SCM_STRING_CHARS is deprecated in Guile 1.8.x.
diff --git a/libgeda/src/g_smob.c b/libgeda/src/g_smob.c
index cba1682..6fbc74b 100644
--- a/libgeda/src/g_smob.c
+++ b/libgeda/src/g_smob.c
@@ -168,7 +168,7 @@ SCM g_set_attrib_value_internal(SCM attrib_smob, SCM scm_value,
"set-attribute-value!");
attribute = (struct st_attrib_smob *)SCM_CDR(attrib_smob);
- value = SCM_STRING_CHARS (scm_value);
+ value = scm_to_locale_string (scm_value);
if (attribute != NULL &&
attribute->attribute != NULL) {
@@ -183,6 +183,8 @@ SCM g_set_attrib_value_internal(SCM attrib_smob, SCM scm_value,
g_free(name);
}
+ free (value);
+
return SCM_UNDEFINED;
}
@@ -244,7 +246,7 @@ SCM g_calcule_new_attrib_bounds (SCM attrib_smob, SCM scm_alignment,
x = scm_to_int(scm_x);
y = scm_to_int(scm_y);
- alignment_string = SCM_STRING_CHARS(scm_alignment);
+ alignment_string = scm_to_locale_string (scm_alignment);
if (strlen(alignment_string) == 0) {
alignment = -1;
@@ -276,6 +278,9 @@ SCM g_calcule_new_attrib_bounds (SCM attrib_smob, SCM scm_alignment,
if (strcmp(alignment_string, "Upper Right") == 0) {
alignment = 8;
}
+
+ free (alignment_string);
+
if (alignment == -2) {
/* Bad specified */
SCM_ASSERT (scm_is_string(scm_alignment), scm_alignment,
@@ -563,7 +568,7 @@ SCM g_get_attrib_value_by_attrib_name(SCM object_smob, SCM scm_attrib_name)
/* Get parameters */
object = (struct st_object_smob *)SCM_CDR(object_smob);
- attrib_name = SCM_STRING_CHARS(scm_attrib_name);
+ attrib_name = scm_to_locale_string (scm_attrib_name);
if (object && object->object) {
@@ -582,6 +587,8 @@ SCM g_get_attrib_value_by_attrib_name(SCM object_smob, SCM scm_attrib_name)
}
}
+ free (attrib_name);
+
return returned;
}
diff --git a/libgeda/src/s_clib.c b/libgeda/src/s_clib.c
index c18cdc0..a537c47 100644
--- a/libgeda/src/s_clib.c
+++ b/libgeda/src/s_clib.c
@@ -717,6 +717,7 @@ static void refresh_scm (CLibSource *source)
SCM symlist;
SCM symname;
CLibSymbol *symbol;
+ char *tmp;
g_return_if_fail (source != NULL);
g_return_if_fail (source->type == CLIB_SCM);
@@ -742,8 +743,12 @@ static void refresh_scm (CLibSource *source)
} else {
symbol = g_new0 (CLibSymbol, 1);
symbol->source = source;
- symbol->name = g_strdup(SCM_STRING_CHARS (symname));
-
+
+ /* Need to make sure that the correct free() function is called
+ * on strings allocated by Guile. */
+ tmp = scm_to_locale_string (symname);
+ symbol->name = g_strdup(tmp);
+ free (tmp);
/* Prepend because it's faster and it doesn't matter what order we
* add them. */
@@ -1124,6 +1129,8 @@ static gchar *get_data_command (const CLibSymbol *symbol)
static gchar *get_data_scm (const CLibSymbol *symbol)
{
SCM symdata;
+ char *tmp;
+ gchar *result;
g_return_val_if_fail ((symbol != NULL), NULL);
g_return_val_if_fail ((symbol->source->type == CLIB_SCM), NULL);
@@ -1137,7 +1144,13 @@ static gchar *get_data_scm (const CLibSymbol *symbol)
return NULL;
}
- return g_strdup (SCM_STRING_CHARS (symdata));
+ /* Need to make sure that the correct free() function is called
+ * on strings allocated by Guile. */
+ tmp = scm_to_locale_string (symdata);
+ result = g_strdup(tmp);
+ free (tmp);
+
+ return result;
}
/*! \brief Get symbol data.
commit d66220b8d3085c7ab55bac419b125d9287c0520d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
Ignore yet more unnecessary m4 files installed by autopoint.
diff --git a/gschem/m4/.gitignore b/gschem/m4/.gitignore
index 9b2675b..37bf6f9 100644
--- a/gschem/m4/.gitignore
+++ b/gschem/m4/.gitignore
@@ -16,6 +16,7 @@ lib-ld.m4
lib-link.m4
lib-prefix.m4
lock.m4
+longdouble.m4
longlong.m4
nls.m4
po.m4
@@ -24,6 +25,7 @@ progtest.m4
size_max.m4
stdint_h.m4
uintmax_t.m4
+ulonglong.m4
visibility.m4
wchar_t.m4
wint_t.m4
diff --git a/libgeda/m4/.gitignore b/libgeda/m4/.gitignore
index d5d05f6..a67d7b2 100644
--- a/libgeda/m4/.gitignore
+++ b/libgeda/m4/.gitignore
@@ -20,6 +20,7 @@ lib-link.m4
lib-prefix.m4
libtool.m4
lock.m4
+longdouble.m4
longlong.m4
ltoptions.m4
ltsugar.m4
@@ -32,6 +33,7 @@ progtest.m4
size_max.m4
stdint_h.m4
uintmax_t.m4
+ulonglong.m4
visibility.m4
wchar_t.m4
wint_t.m4
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs