[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.2-20090328-55-g9686b31)
The branch, master has been updated
via 9686b31bc86c7e57a26bad0c65e21b97ed713e5b (commit)
via 2eeacf64e952d65c93cc3dc564bc666b5fa272b1 (commit)
from 6f54111ee069795ab27292e23181be49751cc5ce (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/s_table.c | 1 -
gattrib/src/s_toplevel.c | 2 +-
gnetlist/src/g_netlist.c | 2 +-
gnetlist/src/vams_misc.c | 3 +--
gschem/src/g_hook.c | 32 ++++++++++++++------------------
gschem/src/o_misc.c | 5 ++---
gschem/src/o_slot.c | 2 +-
gschem/src/x_attribedit.c | 3 +--
gschem/src/x_compselect.c | 4 ++--
gschem/src/x_dialog.c | 2 +-
gschem/src/x_multiattrib.c | 18 ++++--------------
libgeda/include/libgeda/prototype.h | 3 ++-
libgeda/src/g_smob.c | 20 ++++++++------------
libgeda/src/o_attrib.c | 31 +++++++++++++++++++++++++------
libgeda/src/o_complex_basic.c | 2 +-
libgeda/src/o_text_basic.c | 10 +++++-----
16 files changed, 69 insertions(+), 71 deletions(-)
=================
Commit Messages
=================
commit 9686b31bc86c7e57a26bad0c65e21b97ed713e5b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Make o_attrib_get_name_value() take an attrib OBJECT, not char *
Rename the old function as exported API o_attrib_string_get_name_value(),
so existing code (such as validating potential attribute strings) can
still work unaltered.
The new o_attrib_get_name_value() wraps o_attrib_string_get_name_value().
:100644 100644 f3fafc2... c76385e... M gattrib/src/s_toplevel.c
:100644 100644 61d3e26... 9c87e81... M gnetlist/src/g_netlist.c
:100644 100644 253772c... fc44bad... M gnetlist/src/vams_misc.c
:100644 100644 2a3ea32... 6704812... M gschem/src/g_hook.c
:100644 100644 812efa2... 8d69bc6... M gschem/src/o_misc.c
:100644 100644 dea14bc... 425f7c2... M gschem/src/o_slot.c
:100644 100644 56f9be6... 74dbfca... M gschem/src/x_attribedit.c
:100644 100644 b596903... 20f7e74... M gschem/src/x_compselect.c
:100644 100644 074f963... 58a3e3b... M gschem/src/x_dialog.c
:100644 100644 23aa994... b10899d... M gschem/src/x_multiattrib.c
:100644 100644 10cf349... ff31336... M libgeda/include/libgeda/prototype.h
:100644 100644 b57389d... cba1682... M libgeda/src/g_smob.c
:100644 100644 e6cfc1a... 236540d... M libgeda/src/o_attrib.c
:100644 100644 b8629aa... d363d9f... M libgeda/src/o_complex_basic.c
:100644 100644 289597e... 304e0f9... M libgeda/src/o_text_basic.c
commit 2eeacf64e952d65c93cc3dc564bc666b5fa272b1
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gattrib: Remove spurious o_attrib_get_name_value() call left after revert
This call was left behind, and should have been removed in
commit #dc402ee9c0b5196634c83ed8fd2e2f059a4338cb,
The code being removed was added in
commit #17cd47a31a4b84d02726391f980ae493d927809b
:100644 100644 189dfc2... 25fca77... M gattrib/src/s_table.c
=========
Changes
=========
commit 9686b31bc86c7e57a26bad0c65e21b97ed713e5b
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
Make o_attrib_get_name_value() take an attrib OBJECT, not char *
Rename the old function as exported API o_attrib_string_get_name_value(),
so existing code (such as validating potential attribute strings) can
still work unaltered.
The new o_attrib_get_name_value() wraps o_attrib_string_get_name_value().
diff --git a/gattrib/src/s_toplevel.c b/gattrib/src/s_toplevel.c
index f3fafc2..c76385e 100644
--- a/gattrib/src/s_toplevel.c
+++ b/gattrib/src/s_toplevel.c
@@ -666,7 +666,7 @@ void s_toplevel_update_component_attribs_in_toplevel(OBJECT *o_current,
#else
/* might now compile now, but this #if'd out branch isn't being built */
gint status;
- status = o_attrib_get_name_value(old_name_value_pair, &old_attrib_name, &old_attrib_value);
+ status = o_attrib_get_name_value (a_current, &old_attrib_name, &old_attrib_value);
if (status == 0) {
/* Don't put "refdes" or "slot" into list. Don't put old name=value pair into list if a new
* one is already in there. */
diff --git a/gnetlist/src/g_netlist.c b/gnetlist/src/g_netlist.c
index 61d3e26..9c87e81 100644
--- a/gnetlist/src/g_netlist.c
+++ b/gnetlist/src/g_netlist.c
@@ -955,7 +955,7 @@ SCM g_graphical_objs_in_net_with_attrib_get_attrib (SCM scm_netname, SCM scm_has
net_name = pl_current->net_name;
if (strcmp(net_name, wanted_net_name) == 0) {
- if (o_attrib_get_name_value (has_attrib, &has_attrib_name,
+ if (o_attrib_string_get_name_value (has_attrib, &has_attrib_name,
&has_attrib_value) != 0) {
attrib_value =
o_attrib_search_object_attribs_by_name (nl_current->object_ptr,
diff --git a/gnetlist/src/vams_misc.c b/gnetlist/src/vams_misc.c
index 253772c..fc44bad 100644
--- a/gnetlist/src/vams_misc.c
+++ b/gnetlist/src/vams_misc.c
@@ -52,8 +52,7 @@ vams_get_attribs_list (OBJECT *object)
while(a_iter != NULL) {
a_current = a_iter->data;
if (a_current->text && a_current->text->string) {
- val = o_attrib_get_name_value(a_current->text->string,
- &found_name, NULL);
+ val = o_attrib_get_name_value (a_current, &found_name, NULL);
if (val) {
list = scm_cons (scm_makfrom0str (found_name), list);
diff --git a/gschem/src/g_hook.c b/gschem/src/g_hook.c
index 2a3ea32..6704812 100644
--- a/gschem/src/g_hook.c
+++ b/gschem/src/g_hook.c
@@ -401,7 +401,6 @@ static void custom_world_get_single_object_bounds
OBJECT *a_current;
GList *a_iter;
int rleft, rright, rbottom, rtop;
- const gchar *text_value;
char *name_ptr, aux_ptr[2];
gboolean include_text;
@@ -421,23 +420,20 @@ static void custom_world_get_single_object_bounds
&rleft, &rtop, &rright, &rbottom);
break;
case (OBJ_TEXT):
- text_value = o_text_get_string (toplevel, obj_ptr);
- if (text_value) {
- if (o_attrib_get_name_value(text_value, &name_ptr, NULL) &&
- g_list_find_custom(exclude_attrib_list, name_ptr, (GCompareFunc) &strcmp)) {
- include_text = FALSE;
- }
- if (g_list_find_custom(exclude_attrib_list, "all",
- (GCompareFunc) &strcmp)) {
- include_text = FALSE;
- }
- if (include_text) {
- world_get_single_object_bounds (toplevel, obj_ptr,
- &rleft, &rtop, &rright, &rbottom);
- }
- g_free(name_ptr);
- }
- break;
+ if (o_attrib_get_name_value (obj_ptr, &name_ptr, NULL) &&
+ g_list_find_custom (exclude_attrib_list, name_ptr, (GCompareFunc) &strcmp)) {
+ include_text = FALSE;
+ }
+ if (g_list_find_custom (exclude_attrib_list, "all",
+ (GCompareFunc) &strcmp)) {
+ include_text = FALSE;
+ }
+ if (include_text) {
+ world_get_single_object_bounds (toplevel, obj_ptr,
+ &rleft, &rtop, &rright, &rbottom);
+ }
+ g_free(name_ptr);
+ break;
case (OBJ_COMPLEX):
case (OBJ_PLACEHOLDER):
custom_world_get_object_glist_bounds (toplevel,
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index 812efa2..8d69bc6 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -82,7 +82,7 @@ void o_edit(GSCHEM_TOPLEVEL *w_current, GList *list)
break;
case(OBJ_TEXT):
str = o_text_get_string (w_current->toplevel, o_current);
- if (o_attrib_get_name_value (str, NULL, NULL) &&
+ if (o_attrib_get_name_value (o_current, NULL, NULL) &&
/* attribute editor only accept 1-line values for attribute */
o_text_num_lines (str) == 1) {
attrib_edit_dialog(w_current,o_current, FROM_MENU);
@@ -749,8 +749,7 @@ void o_update_component(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
a_current = a_iter->data;
g_assert (a_current->type == OBJ_TEXT);
- o_attrib_get_name_value (o_text_get_string (toplevel, a_current),
- &name, NULL);
+ o_attrib_get_name_value (a_current, &name, NULL);
/* We are only interested in the attributes which were promoted during
* load of the new complex. Any which aren't already promoted in the
diff --git a/gschem/src/o_slot.c b/gschem/src/o_slot.c
index dea14bc..425f7c2 100644
--- a/gschem/src/o_slot.c
+++ b/gschem/src/o_slot.c
@@ -76,7 +76,7 @@ void o_slot_end(GSCHEM_TOPLEVEL *w_current, const char *string, int len)
int new_slot_number;
int status;
- status = o_attrib_get_name_value(string, NULL, &value);
+ status = o_attrib_string_get_name_value (string, NULL, &value);
if (!status) {
s_log_message(_("Slot attribute malformed\n"));
return;
diff --git a/gschem/src/x_attribedit.c b/gschem/src/x_attribedit.c
index 56f9be6..74dbfca 100644
--- a/gschem/src/x_attribedit.c
+++ b/gschem/src/x_attribedit.c
@@ -487,8 +487,7 @@ void attrib_edit_dialog (GSCHEM_TOPLEVEL *w_current, OBJECT *attr_obj, int flag)
/* gschem specific */
if (attr_obj) {
- o_attrib_get_name_value (o_text_get_string (toplevel, attr_obj),
- &name, &val);
+ o_attrib_get_name_value (attr_obj, &name, &val);
attrib = attr_obj;
if (attrib->visibility == VISIBLE) {
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(visbutton), TRUE);
diff --git a/gschem/src/x_compselect.c b/gschem/src/x_compselect.c
index b596903..20f7e74 100644
--- a/gschem/src/x_compselect.c
+++ b/gschem/src/x_compselect.c
@@ -522,7 +522,7 @@ update_attributes_model (Compselect *compselect, TOPLEVEL *preview_toplevel)
o_attrlist = g_list_sort (o_attrlist, (GCompareFunc) sort_object_text);
for (o_iter = o_attrlist; o_iter != NULL; o_iter = g_list_next (o_iter)) {
o_current = o_iter->data;
- o_attrib_get_name_value (o_current->text->string, &name, &value);
+ o_attrib_get_name_value (o_current, &name, &value);
gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter, 0, name, 1, value, -1);
g_free (name);
@@ -535,7 +535,7 @@ update_attributes_model (Compselect *compselect, TOPLEVEL *preview_toplevel)
listiter = g_list_next (listiter)) {
for (o_iter = o_attrlist; o_iter != NULL; o_iter = g_list_next (o_iter)) {
o_current = o_iter->data;
- if (o_attrib_get_name_value (o_current->text->string, &name, &value)) {
+ if (o_attrib_get_name_value (o_current, &name, &value)) {
if (strcmp (name, listiter->data) == 0) {
gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter, 0, name, 1, value, -1);
diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c
index 074f963..58a3e3b 100644
--- a/gschem/src/x_dialog.c
+++ b/gschem/src/x_dialog.c
@@ -4273,7 +4273,7 @@ int x_dialog_validate_attribute(GtkWindow* parent, char *attribute)
GtkWidget* message_box;
/* validate the new attribute */
- if (!o_attrib_get_name_value(attribute, NULL, NULL)) {
+ if (!o_attrib_string_get_name_value (attribute, NULL, NULL)) {
message_box = gtk_message_dialog_new_with_markup (parent,
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
diff --git a/gschem/src/x_multiattrib.c b/gschem/src/x_multiattrib.c
index 23aa994..b10899d 100644
--- a/gschem/src/x_multiattrib.c
+++ b/gschem/src/x_multiattrib.c
@@ -716,7 +716,6 @@ static void multiattrib_column_set_data_name(GtkTreeViewColumn *tree_column,
OBJECT *o_attrib;
gchar *name;
Multiattrib *dialog = (Multiattrib *) data;
- const gchar *str = NULL;
int inherited;
gtk_tree_model_get (tree_model, iter,
@@ -724,11 +723,9 @@ static void multiattrib_column_set_data_name(GtkTreeViewColumn *tree_column,
-1);
g_assert (o_attrib->type == OBJ_TEXT);
- str = o_text_get_string (GSCHEM_DIALOG(dialog)->w_current->toplevel,
- o_attrib);
inherited = o_attrib_is_inherited (o_attrib);
- o_attrib_get_name_value (str, &name, NULL);
+ o_attrib_get_name_value (o_attrib, &name, NULL);
g_object_set (cell,
"text", name,
"foreground-gdk", inherited ? &dialog->insensitive_text_color : NULL,
@@ -752,7 +749,6 @@ static void multiattrib_column_set_data_value(GtkTreeViewColumn *tree_column,
OBJECT *o_attrib;
gchar *value;
Multiattrib *dialog = (Multiattrib *) data;
- const gchar *str = NULL;
int inherited;
gtk_tree_model_get (tree_model, iter,
@@ -760,11 +756,9 @@ static void multiattrib_column_set_data_value(GtkTreeViewColumn *tree_column,
-1);
g_assert (o_attrib->type == OBJ_TEXT);
- str = o_text_get_string (GSCHEM_DIALOG(dialog)->w_current->toplevel,
- o_attrib);
inherited = o_attrib_is_inherited (o_attrib);
- o_attrib_get_name_value (str, NULL, &value);
+ o_attrib_get_name_value (o_attrib, NULL, &value);
g_object_set (cell,
"text", value,
"foreground-gdk", inherited ? &dialog->insensitive_text_color : NULL,
@@ -926,9 +920,7 @@ static void multiattrib_callback_edited_name(GtkCellRendererText *cellrendererte
-1);
g_assert (o_attrib->type == OBJ_TEXT);
- o_attrib_get_name_value (o_text_get_string (w_current->toplevel,
- o_attrib),
- NULL, &value);
+ o_attrib_get_name_value (o_attrib, NULL, &value);
newtext = g_strdup_printf ("%s=%s", arg2, value);
if (!x_dialog_validate_attribute(GTK_WINDOW(multiattrib), newtext)) {
@@ -976,9 +968,7 @@ static void multiattrib_callback_edited_value(GtkCellRendererText *cell_renderer
-1);
g_assert (o_attrib->type == OBJ_TEXT);
- o_attrib_get_name_value (o_text_get_string (w_current->toplevel,
- o_attrib),
- &name, NULL);
+ o_attrib_get_name_value (o_attrib, &name, NULL);
newtext = g_strdup_printf ("%s=%s", name, arg2);
if (!x_dialog_validate_attribute(GTK_WINDOW(multiattrib), newtext)) {
diff --git a/libgeda/include/libgeda/prototype.h b/libgeda/include/libgeda/prototype.h
index 10cf349..ff31336 100644
--- a/libgeda/include/libgeda/prototype.h
+++ b/libgeda/include/libgeda/prototype.h
@@ -100,7 +100,8 @@ void o_attrib_attach_list(TOPLEVEL *toplevel, GList *attr_list, OBJECT *object,
void o_attrib_detach_all(TOPLEVEL *toplevel, GList *list);
void o_attrib_print(GList *attributes);
void o_attrib_remove(GList **list, OBJECT *remove);
-gboolean o_attrib_get_name_value (const gchar *string, gchar **name_ptr, gchar **value_ptr);
+gboolean o_attrib_string_get_name_value (const gchar *string, gchar **name_ptr, gchar **value_ptr);
+gboolean o_attrib_get_name_value (OBJECT *attrib, gchar **name_ptr, gchar **value_ptr);
GList *o_attrib_find_floating_attribs (const GList *list);
char *o_attrib_search_floating_attribs_by_name (const GList *list, char *name, int counter);
char *o_attrib_search_attached_attribs_by_name (OBJECT *object, char *name, int counter);
diff --git a/libgeda/src/g_smob.c b/libgeda/src/g_smob.c
index b57389d..cba1682 100644
--- a/libgeda/src/g_smob.c
+++ b/libgeda/src/g_smob.c
@@ -127,10 +127,9 @@ SCM g_get_attrib_name_value(SCM attrib_smob)
attribute = (struct st_attrib_smob *)SCM_CDR(attrib_smob);
- if (attribute &&
- attribute->attribute &&
- attribute->attribute->text->string ) {
- o_attrib_get_name_value(attribute->attribute->text->string, &name, &value );
+ if (attribute != NULL &&
+ attribute->attribute != NULL) {
+ o_attrib_get_name_value (attribute->attribute, &name, &value );
returned = scm_cons (scm_makfrom0str (name),
scm_makfrom0str (value));
g_free(name);
@@ -171,13 +170,10 @@ SCM g_set_attrib_value_internal(SCM attrib_smob, SCM scm_value,
attribute = (struct st_attrib_smob *)SCM_CDR(attrib_smob);
value = SCM_STRING_CHARS (scm_value);
- if (attribute &&
- attribute->attribute &&
- attribute->attribute->text &&
- attribute->attribute->text->string ) {
+ if (attribute != NULL &&
+ attribute->attribute != NULL) {
- o_attrib_get_name_value(attribute->attribute->text->string,
- &name, NULL);
+ o_attrib_get_name_value (attribute->attribute, &name, NULL);
*new_string = g_strconcat (name, "=", value, NULL);
@@ -575,8 +571,8 @@ SCM g_get_attrib_value_by_attrib_name(SCM object_smob, SCM scm_attrib_name)
a_iter = object->object->attribs;
while (a_iter != NULL) {
a_current = a_iter->data;
- if (a_current && a_current->text) {
- o_attrib_get_name_value(a_current->text->string, &name, &value );
+ if (a_current != NULL) {
+ o_attrib_get_name_value (a_current, &name, &value );
if (strcmp(name, attrib_name) == 0)
returned = scm_cons (scm_makfrom0str (value), returned);
g_free (name);
diff --git a/libgeda/src/o_attrib.c b/libgeda/src/o_attrib.c
index e6cfc1a..236540d 100644
--- a/libgeda/src/o_attrib.c
+++ b/libgeda/src/o_attrib.c
@@ -388,7 +388,7 @@ GList *o_read_attribs (TOPLEVEL *toplevel,
* \return TRUE on success, FALSE otherwise.
*/
gboolean
-o_attrib_get_name_value (const gchar *string, gchar **name_ptr, gchar **value_ptr)
+o_attrib_string_get_name_value (const gchar *string, gchar **name_ptr, gchar **value_ptr)
{
gchar *ptr, *prev_char, *next_char;
@@ -423,6 +423,25 @@ o_attrib_get_name_value (const gchar *string, gchar **name_ptr, gchar **value_pt
}
+/*! \brief Get name and value from an attribute OBJECT
+ * \par Function Description
+ * See o_attrib_string_get_name_value() for more details
+ *
+ * \param [in] attrib The attribute OBJECT whos name/value to return.
+ * \param [out] name_ptr The return location for the name, or NULL.
+ * \param [out] value_ptr The return location for the value, or NULL.
+ * \return TRUE on success, FALSE otherwise.
+ */
+gboolean
+o_attrib_get_name_value (OBJECT *attrib, gchar **name_ptr, gchar **value_ptr)
+{
+ g_return_val_if_fail (attrib->type == OBJ_TEXT, FALSE);
+
+ return o_attrib_string_get_name_value (attrib->text->string,
+ name_ptr, value_ptr);
+}
+
+
/*! \brief Find all floating attributes in the given object list.
* \par Function Description
* Find all floating attributes in the given object list.
@@ -447,7 +466,7 @@ GList *o_attrib_find_floating_attribs (const GList *list)
*/
if (o_current->type == OBJ_TEXT &&
o_current->attached_to == NULL &&
- o_attrib_get_name_value (o_current->text->string, NULL, NULL)) {
+ o_attrib_get_name_value (o_current, NULL, NULL)) {
floating_attributes = g_list_prepend (floating_attributes, o_current);
}
@@ -481,7 +500,7 @@ static OBJECT *o_attrib_find_attrib_by_name (const GList *list, char *name, int
g_return_val_if_fail (a_current->type == OBJ_TEXT, NULL);
- if (!o_attrib_get_name_value (a_current->text->string, &found_name, NULL))
+ if (!o_attrib_get_name_value (a_current, &found_name, NULL))
continue;
if (strcmp (name, found_name) == 0) {
@@ -519,7 +538,7 @@ static char *o_attrib_search_attrib_list_by_name (const GList *list, char *name,
attrib = o_attrib_find_attrib_by_name (list, name, counter);
if (attrib != NULL)
- o_attrib_get_name_value (attrib->text->string, NULL, &value);
+ o_attrib_get_name_value (attrib, NULL, &value);
return value;
}
@@ -650,7 +669,7 @@ char *o_attrib_search_slot(OBJECT *object, OBJECT **return_found)
g_list_free (attributes);
if (attrib != NULL)
- o_attrib_get_name_value (attrib->text->string, NULL, &value);
+ o_attrib_get_name_value (attrib, NULL, &value);
if (return_found)
*return_found = attrib;
@@ -858,7 +877,7 @@ GList * o_attrib_return_attribs (OBJECT *object)
continue;
/* Don't add invalid attributes to the list */
- if (!o_attrib_get_name_value (a_current->text->string, NULL, NULL))
+ if (!o_attrib_get_name_value (a_current, NULL, NULL))
continue;
attribs = g_list_prepend (attribs, a_current);
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index b8629aa..d363d9f 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -213,7 +213,7 @@ static int o_complex_is_eligible_attribute (TOPLEVEL *toplevel, OBJECT *object)
/* check list against attributes which can be promoted */
if (toplevel->always_promote_attributes != NULL) {
- if (o_attrib_get_name_value(object->text->string, &name, NULL)) {
+ if (o_attrib_get_name_value (object, &name, NULL)) {
if (g_list_find_custom(toplevel->always_promote_attributes,
name, (GCompareFunc) strcmp) != NULL) {
/* Name of the attribute was in the always promote attributes list */
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 289597e..304e0f9 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -113,16 +113,16 @@ int tab_in_chars = 8;
*
* \param [in] o The OBJECT to update
*/
-static void update_disp_string(OBJECT *o)
+static void update_disp_string (OBJECT *object)
{
char *name = NULL;
char *value = NULL;
- TEXT *text = o->text;
+ TEXT *text = object->text;
g_free (text->disp_string);
- if (o_attrib_get_name_value (text->string, &name, &value)) {
- switch (o->show_name_value) {
+ if (o_attrib_get_name_value (object, &name, &value)) {
+ switch (object->show_name_value) {
case (SHOW_NAME_VALUE):
text->disp_string = g_strdup (text->string);
break;
@@ -1563,7 +1563,7 @@ void o_text_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
f_print_set_color(toplevel, fp, o_current->color);
- if (o_attrib_get_name_value(o_current->text->string, &name, &value)) {
+ if (o_attrib_get_name_value (o_current, &name, &value)) {
switch(o_current->show_name_value) {
case(SHOW_NAME_VALUE):
output_string = g_strdup(o_current->text->string);
commit 2eeacf64e952d65c93cc3dc564bc666b5fa272b1
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>
gattrib: Remove spurious o_attrib_get_name_value() call left after revert
This call was left behind, and should have been removed in
commit #dc402ee9c0b5196634c83ed8fd2e2f059a4338cb,
The code being removed was added in
commit #17cd47a31a4b84d02726391f980ae493d927809b
diff --git a/gattrib/src/s_table.c b/gattrib/src/s_table.c
index 189dfc2..25fca77 100644
--- a/gattrib/src/s_table.c
+++ b/gattrib/src/s_table.c
@@ -291,7 +291,6 @@ void s_table_add_toplevel_comp_items_to_comp_table (const GList *obj_list) {
&& a_current->text != NULL) { /* found an attribute */
/* may need to check more thoroughly here. . . . */
attrib_text = g_strdup(a_current->text->string);
- o_attrib_get_name_value(attrib_text, &attrib_name, &attrib_value);
attrib_name = u_basic_breakup_string(attrib_text, '=', 0);
attrib_value = s_misc_remaining_string(attrib_text, '=', 1);
old_visibility = a_current->visibility;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs