[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-65-g4595948)
The branch, master has been updated
via 4595948e41b2d195eb78a820fc15d0d8596067a4 (commit)
from 89e453d165095d22c151ff9c1195c7d3e1fea811 (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/gtksheet_2_2.c | 36 ++++++++++++++++++------------------
gnetlist/src/s_traverse.c | 4 ++--
gschem/src/i_callbacks.c | 16 ++++++++--------
gschem/src/o_attrib.c | 4 ++--
gschem/src/o_basic.c | 6 +++---
gschem/src/o_complex.c | 8 ++++----
gschem/src/o_copy.c | 4 ++--
gschem/src/o_cue.c | 12 ++++++------
gschem/src/o_delete.c | 2 +-
gschem/src/o_find.c | 2 +-
gschem/src/o_grips.c | 2 +-
gschem/src/o_misc.c | 12 ++++++------
gschem/src/o_move.c | 6 +++---
gschem/src/o_net.c | 4 ++--
gschem/src/o_picture.c | 2 +-
gschem/src/o_select.c | 2 +-
gschem/src/o_text.c | 2 +-
gschem/src/x_attribedit.c | 6 +++---
gschem/src/x_dialog.c | 8 ++++----
gschem/src/x_window.c | 2 +-
gsymcheck/src/s_check.c | 12 ++++++------
gsymcheck/src/s_symstruct.c | 6 +++---
libgeda/src/o_basic.c | 2 +-
libgeda/src/o_complex_basic.c | 22 +++++++++++-----------
libgeda/src/o_list.c | 4 ++--
libgeda/src/o_net_basic.c | 4 ++--
libgeda/src/o_selection.c | 2 +-
libgeda/src/s_basic.c | 2 +-
libgeda/src/s_conn.c | 18 +++++++++---------
libgeda/src/s_cue.c | 4 ++--
libgeda/src/s_tile.c | 6 +++---
utils/src/gsch2pcb.c | 10 +++++-----
32 files changed, 116 insertions(+), 116 deletions(-)
=================
Commit Messages
=================
commit 4595948e41b2d195eb78a820fc15d0d8596067a4
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Oct 4 02:34:50 2007 +0100
Avoid accessing (GList)->{next|priv} directly to aid debugging.
Instead use g_list_{next|previous}, allowing us to catch errors where
changing from gEDA structures which had their own next and prev pointers.
To debug, edit the glist.h include file from glib, renaming the next and
prev elements in the GList structure and macros. Recompile gEDA to see any
bad accesses such as those where the HEAD nodes were previously skipped.
:100644 100644 c9ab15d... 6fcf77b... M gattrib/src/gtksheet_2_2.c
:100644 100644 ae63a3b... 8f10a33... M gnetlist/src/s_traverse.c
:100644 100644 f6e86d8... 5e3169a... M gschem/src/i_callbacks.c
:100644 100644 a18a37d... dfb4132... M gschem/src/o_attrib.c
:100644 100644 87802ee... 57f2e55... M gschem/src/o_basic.c
:100644 100644 c7ddc3c... 90c11d0... M gschem/src/o_complex.c
:100644 100644 3852003... dcba046... M gschem/src/o_copy.c
:100644 100644 1724b44... f60b9fb... M gschem/src/o_cue.c
:100644 100644 ec5cb0d... 535527f... M gschem/src/o_delete.c
:100644 100644 411a634... 336a190... M gschem/src/o_find.c
:100644 100644 4a41fc6... c2b893a... M gschem/src/o_grips.c
:100644 100644 fdfad7b... 48b28a4... M gschem/src/o_misc.c
:100644 100644 74c7655... 8cca01a... M gschem/src/o_move.c
:100644 100644 b27f0ed... ae8e7b0... M gschem/src/o_net.c
:100644 100644 5a6c7d7... b0462e3... M gschem/src/o_picture.c
:100644 100644 388e268... ecac644... M gschem/src/o_select.c
:100644 100644 e2718d0... 2fecb84... M gschem/src/o_text.c
:100644 100644 cfcff5b... 97a5c42... M gschem/src/x_attribedit.c
:100644 100644 f6b4aff... ac78d81... M gschem/src/x_dialog.c
:100644 100644 fac1355... 8db910b... M gschem/src/x_window.c
:100644 100644 2156254... 29f964f... M gsymcheck/src/s_check.c
:100644 100644 5c10d8f... b5a0aaa... M gsymcheck/src/s_symstruct.c
:100644 100644 083e2a0... fa0b7c8... M libgeda/src/o_basic.c
:100644 100644 83da47d... 699a2d3... M libgeda/src/o_complex_basic.c
:100644 100644 ddf7f1e... 15de6b2... M libgeda/src/o_list.c
:100644 100644 e44b93b... 572e711... M libgeda/src/o_net_basic.c
:100644 100644 25fd075... f890702... M libgeda/src/o_selection.c
:100644 100644 ba0f74b... 7668555... M libgeda/src/s_basic.c
:100644 100644 669c704... ca9a1c1... M libgeda/src/s_conn.c
:100644 100644 9f77e96... d0341cf... M libgeda/src/s_cue.c
:100644 100644 270e775... 3ad2a7f... M libgeda/src/s_tile.c
:100644 100644 843fad2... de3de1f... M utils/src/gsch2pcb.c
=========
Changes
=========
commit 4595948e41b2d195eb78a820fc15d0d8596067a4
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Oct 4 02:34:50 2007 +0100
Avoid accessing (GList)->{next|priv} directly to aid debugging.
Instead use g_list_{next|previous}, allowing us to catch errors where
changing from gEDA structures which had their own next and prev pointers.
To debug, edit the glist.h include file from glib, renaming the next and
prev elements in the GList structure and macros. Recompile gEDA to see any
bad accesses such as those where the HEAD nodes were previously skipped.
diff --git a/gattrib/src/gtksheet_2_2.c b/gattrib/src/gtksheet_2_2.c
index c9ab15d..6fcf77b 100644
--- a/gattrib/src/gtksheet_2_2.c
+++ b/gattrib/src/gtksheet_2_2.c
@@ -2780,7 +2780,7 @@ gtk_sheet_realize (GtkWidget * widget)
while(children)
{
child = children->data;
- children = children->next;
+ children = g_list_next(children);
gtk_sheet_realize_child(sheet, child);
}
@@ -2916,7 +2916,7 @@ gtk_sheet_map (GtkWidget * widget)
while (children)
{
child = children->data;
- children = children->next;
+ children = g_list_next(children);
if (GTK_WIDGET_VISIBLE (child->widget) &&
!GTK_WIDGET_MAPPED (child->widget)){
@@ -2961,7 +2961,7 @@ gtk_sheet_unmap (GtkWidget * widget)
while (children)
{
child = children->data;
- children = children->next;
+ children = g_list_next(children);
if (GTK_WIDGET_VISIBLE (child->widget) &&
GTK_WIDGET_MAPPED (child->widget))
@@ -5940,7 +5940,7 @@ gtk_sheet_size_request (GtkWidget * widget,
while (children)
{
child = children->data;
- children = children->next;
+ children = g_list_next(children);
gtk_widget_size_request(child->widget, &child_requisition);
}
@@ -6445,7 +6445,7 @@ gtk_sheet_get_entry(GtkSheet *sheet)
if(GTK_IS_ENTRY(entry))
break;
- children = children->next;
+ children = g_list_next(children);
}
@@ -7319,7 +7319,7 @@ gtk_sheet_insert_rows(GtkSheet *sheet, guint row, guint nrows)
if(child->attached_to_cell)
if(child->row >= row) child->row += nrows;
- children = children->next;
+ children = g_list_next(children);
}
if(!GTK_WIDGET_REALIZED(sheet)) return;
@@ -7356,7 +7356,7 @@ gtk_sheet_insert_columns(GtkSheet *sheet, guint col, guint ncols)
if(child->attached_to_cell)
if(child->col >= col) child->col += ncols;
- children = children->next;
+ children = g_list_next(children);
}
if(!GTK_WIDGET_REALIZED(sheet)) return;
@@ -7399,7 +7399,7 @@ gtk_sheet_delete_rows(GtkSheet *sheet, guint row, guint nrows)
gtk_container_remove(GTK_CONTAINER(sheet), child->widget);
children = sheet->children;
} else
- children = children->next;
+ children = g_list_next(children);
}
children = sheet->children;
@@ -7408,7 +7408,7 @@ gtk_sheet_delete_rows(GtkSheet *sheet, guint row, guint nrows)
child = (GtkSheetChild *)children->data;
if(child->attached_to_cell && child->row > row) child->row -= nrows;
- children = children->next;
+ children = g_list_next(children);
}
if(!GTK_WIDGET_REALIZED(sheet)) return;
@@ -7466,7 +7466,7 @@ gtk_sheet_delete_columns(GtkSheet *sheet, guint col, guint ncols)
gtk_container_remove(GTK_CONTAINER(sheet), child->widget);
children = sheet->children;
} else
- children = children->next;
+ children = g_list_next(children);
}
children = sheet->children;
@@ -7475,7 +7475,7 @@ gtk_sheet_delete_columns(GtkSheet *sheet, guint col, guint ncols)
child = (GtkSheetChild *)children->data;
if(child->attached_to_cell && child->col > col) child->col -= ncols;
- children = children->next;
+ children = g_list_next(children);
}
if(!GTK_WIDGET_REALIZED(sheet)) return;
@@ -8526,7 +8526,7 @@ gtk_sheet_row_size_request (GtkSheet *sheet,
if(child_requisition.height + 2 * child->ypadding > *requisition)
*requisition = child_requisition.height + 2 * child->ypadding;
}
- children = children->next;
+ children = g_list_next(children);
}
sheet->row[row].requisition = *requisition;
@@ -8555,7 +8555,7 @@ gtk_sheet_column_size_request (GtkSheet *sheet,
if(child_requisition.width + 2 * child->xpadding > *requisition)
*requisition = child_requisition.width + 2 * child->xpadding;
}
- children = children->next;
+ children = g_list_next(children);
}
sheet->column[col].requisition = *requisition;
@@ -8584,7 +8584,7 @@ gtk_sheet_move_child(GtkSheet *sheet, GtkWidget *widget, gint x, gint y)
return;
}
- children = children->next;
+ children = g_list_next(children);
}
g_warning("Widget must be a GtkSheet child");
@@ -8702,7 +8702,7 @@ gtk_sheet_forall (GtkContainer *container,
while (children)
{
child = children->data;
- children = children->next;
+ children = g_list_next(children);
(* callback) (child->widget, callback_data);
}
@@ -8743,7 +8743,7 @@ gtk_sheet_position_children(GtkSheet *sheet)
gtk_sheet_child_show(child);
}
- children = children->next;
+ children = g_list_next(children);
}
}
@@ -8768,7 +8768,7 @@ gtk_sheet_remove (GtkContainer *container, GtkWidget *widget)
if(child->widget == widget) break;
- children = children->next;
+ children = g_list_next(children);
}
if (children)
@@ -8828,7 +8828,7 @@ gtk_sheet_get_child_at(GtkSheet *sheet, gint row, gint col)
if(child->attached_to_cell)
if(child->row == row && child->col == col) break;
- children = children->next;
+ children = g_list_next(children);
}
if(children) return child;
diff --git a/gnetlist/src/s_traverse.c b/gnetlist/src/s_traverse.c
index ae63a3b..8f10a33 100644
--- a/gnetlist/src/s_traverse.c
+++ b/gnetlist/src/s_traverse.c
@@ -325,7 +325,7 @@ CPINLIST *s_traverse_component(TOPLEVEL * pr_current, OBJECT * component,
}
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
cpins->nets = nets_head;
@@ -480,7 +480,7 @@ NET *s_traverse_net(TOPLEVEL * pr_current, OBJECT * previous_object,
}
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
return (nets);
diff --git a/gschem/src/i_callbacks.c b/gschem/src/i_callbacks.c
index f6e86d8..5e3169a 100644
--- a/gschem/src/i_callbacks.c
+++ b/gschem/src/i_callbacks.c
@@ -1033,7 +1033,7 @@ DEFINE_I_CALLBACK(edit_embed)
(o_current->type == OBJ_PICTURE) ) {
o_embed (w_current, o_current);
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
} else {
/* nothing selected, go back to select state */
@@ -1071,7 +1071,7 @@ DEFINE_I_CALLBACK(edit_unembed)
(o_current->type == OBJ_PICTURE) ) {
o_unembed (w_current, o_current);
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
} else {
/* nothing selected, go back to select state */
@@ -1121,7 +1121,7 @@ DEFINE_I_CALLBACK(edit_update)
/* object was not a OBJ_COMPLEX, so unselect it. */
o_selection_remove( w_current->page_current->selection_list, o_current);
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
g_list_free(selection_copy);
@@ -1286,7 +1286,7 @@ DEFINE_I_CALLBACK(edit_linetype)
objects = g_list_prepend (objects, o_current);
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
if (objects != NULL) {
@@ -1327,7 +1327,7 @@ DEFINE_I_CALLBACK(edit_filltype)
objects = g_list_prepend (objects, o_current);
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
if (objects != NULL) {
@@ -3031,7 +3031,7 @@ DEFINE_I_CALLBACK(attributes_attach)
}
/* skip over first object */
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
while (s_current != NULL) {
if (s_current->data) {
o_attrib_attach(w_current,
@@ -3040,7 +3040,7 @@ DEFINE_I_CALLBACK(attributes_attach)
first_object);
w_current->page_current->CHANGED=1;
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
o_undo_savestate(w_current, UNDO_ALL);
}
@@ -3080,7 +3080,7 @@ DEFINE_I_CALLBACK(attributes_detach)
w_current->page_current->CHANGED=1;
}
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
o_undo_savestate(w_current, UNDO_ALL);
}
diff --git a/gschem/src/o_attrib.c b/gschem/src/o_attrib.c
index a18a37d..dfb4132 100644
--- a/gschem/src/o_attrib.c
+++ b/gschem/src/o_attrib.c
@@ -141,7 +141,7 @@ void o_attrib_toggle_visibility(TOPLEVEL *w_current, GList *list)
w_current->page_current->CHANGED = 1;
}
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
o_undo_savestate(w_current, UNDO_ALL);
}
@@ -178,7 +178,7 @@ void o_attrib_toggle_show_name_value(TOPLEVEL *w_current,
o_text_draw(w_current, object);
w_current->page_current->CHANGED=1;
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
o_undo_savestate(w_current, UNDO_ALL);
}
diff --git a/gschem/src/o_basic.c b/gschem/src/o_basic.c
index 87802ee..57f2e55 100644
--- a/gschem/src/o_basic.c
+++ b/gschem/src/o_basic.c
@@ -161,7 +161,7 @@ void o_draw_list(TOPLEVEL *w_current, GList* list)
o_redraw_single(w_current, o_current);
}
- l_current = l_current->next;
+ l_current = g_list_next(l_current);
}
}
@@ -186,7 +186,7 @@ void o_draw_selected(TOPLEVEL *w_current)
o_redraw_single(w_current, o_current);
o_cue_draw_single(w_current, o_current);
}
- s_current=s_current->next;
+ s_current=g_list_next(s_current);
}
}
@@ -213,7 +213,7 @@ void o_erase_selected(TOPLEVEL *w_current)
o_erase_single(w_current, o_current);
}
- s_current=s_current->next;
+ s_current=g_list_next(s_current);
}
}
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index c7ddc3c..90c11d0 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -193,7 +193,7 @@ void o_complex_place_changed_run_hook(TOPLEVEL *w_current) {
scm_cons (g_make_object_smob
(w_current,
(OBJECT *) ptr->data), SCM_EOL));
- ptr = ptr->next;
+ ptr = g_list_next(ptr);
}
}
@@ -220,7 +220,7 @@ void o_complex_place_rotate(TOPLEVEL *w_current)
y_local = o_current->complex->y;
break;
}
- ptr = ptr->next;
+ ptr = g_list_next(ptr);
}
if (x_local == -1) {
@@ -242,7 +242,7 @@ void o_complex_place_rotate(TOPLEVEL *w_current)
break;
}
- ptr = ptr->next;
+ ptr = g_list_next(ptr);
}
}
@@ -530,7 +530,7 @@ o_complex_translate_display_object_glist(TOPLEVEL *w_current,
while (ptr != NULL) {
o_complex_translate_display_single_object (w_current, x1, y1,
(OBJECT *)ptr->data);
- ptr = ptr->next;
+ ptr = g_list_next(ptr);
}
}
diff --git a/gschem/src/o_copy.c b/gschem/src/o_copy.c
index 3852003..dcba046 100644
--- a/gschem/src/o_copy.c
+++ b/gschem/src/o_copy.c
@@ -368,7 +368,7 @@ void o_copy_end(TOPLEVEL *w_current)
w_current->page_current->object_tail =
(OBJECT *) return_tail(w_current->page_current->
object_head);
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
s_current = geda_list_get_glist( w_current->page_current->selection_list );
@@ -441,7 +441,7 @@ void o_copy_end(TOPLEVEL *w_current)
w_current->page_current->object_tail =
(OBJECT *) return_tail( w_current->page_current->object_head );
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
/* Clean up dangling ATTRIB.copied_to pointers */
diff --git a/gschem/src/o_cue.c b/gschem/src/o_cue.c
index 1724b44..f60b9fb 100644
--- a/gschem/src/o_cue.c
+++ b/gschem/src/o_cue.c
@@ -146,7 +146,7 @@ void o_cue_draw_lowlevel(TOPLEVEL *w_current, OBJECT *object, int whichone)
}
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
#if DEBUG
@@ -389,7 +389,7 @@ void o_cue_draw_lowlevel_midpoints(TOPLEVEL *w_current, OBJECT *object)
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
}
@@ -466,7 +466,7 @@ void o_cue_undraw(TOPLEVEL *w_current, OBJECT *object)
o_redraw_single(w_current, conn->other_object);
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
o_redraw_single(w_current, object);
@@ -505,7 +505,7 @@ void o_cue_undraw_complex(TOPLEVEL *w_current, OBJECT *object)
o_redraw_single(w_current, conn->other_object);
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
}
o_current = o_current->next;
@@ -530,7 +530,7 @@ void o_cue_draw_list(TOPLEVEL *w_current, GList *object_list)
o_cue_draw_single(w_current, object);
- ol_current = ol_current->next;
+ ol_current = g_list_next(ol_current);
}
}
@@ -550,7 +550,7 @@ void o_cue_undraw_list(TOPLEVEL *w_current, GList *object_list)
o_cue_undraw(w_current, object);
- ol_current = ol_current->next;
+ ol_current = g_list_next(ol_current);
}
}
diff --git a/gschem/src/o_delete.c b/gschem/src/o_delete.c
index ec5cb0d..535527f 100644
--- a/gschem/src/o_delete.c
+++ b/gschem/src/o_delete.c
@@ -287,7 +287,7 @@ void o_delete(TOPLEVEL *w_current)
o_delete_arc(w_current, object);
break;
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
w_current->inside_action = 0;
diff --git a/gschem/src/o_find.c b/gschem/src/o_find.c
index 411a634..336a190 100644
--- a/gschem/src/o_find.c
+++ b/gschem/src/o_find.c
@@ -161,7 +161,7 @@ gboolean o_find_selected_object(TOPLEVEL *w_current,
}
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
return (FALSE);
diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index 4a41fc6..c2b893a 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -139,7 +139,7 @@ OBJECT *o_grips_search_world(TOPLEVEL *w_current, int x, int y, int *whichone)
break;
}
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
return(NULL);
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index fdfad7b..48b28a4 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -145,7 +145,7 @@ void o_lock(TOPLEVEL *w_current)
}
}
- s_current=s_current->next;
+ s_current = g_list_next(s_current);
}
if (!w_current->SHIFTKEY) o_select_unselect_all(w_current);
@@ -183,7 +183,7 @@ void o_unlock(TOPLEVEL *w_current)
}
}
- s_current=s_current->next;
+ s_current = g_list_next(s_current);
}
o_undo_savestate(w_current, UNDO_ALL);
}
@@ -451,7 +451,7 @@ void o_rotate_90_world(TOPLEVEL *w_current, GList *list,
}
break;
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
/* All objects were rotated. Do a 2nd pass to run the rotate hooks */
@@ -491,7 +491,7 @@ void o_rotate_90_world(TOPLEVEL *w_current, GList *list,
break;
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
/* Don't save the undo state if we are inside an action */
@@ -686,7 +686,7 @@ void o_mirror_world(TOPLEVEL *w_current, GList *list, int centerx, int centery)
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
@@ -727,7 +727,7 @@ void o_mirror_world(TOPLEVEL *w_current, GList *list, int centerx, int centery)
break;
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index 74c7655..8cca01a 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -270,7 +270,7 @@ void o_move_end(TOPLEVEL * w_current)
break;
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
/* Remove the undo saved in o_move_start */
@@ -403,7 +403,7 @@ void o_move_check_endpoint(TOPLEVEL * w_current, OBJECT * object)
}
}
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
}
@@ -457,7 +457,7 @@ void o_move_prep_rubberband(TOPLEVEL * w_current)
}
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
#if DEBUG
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index b27f0ed..ae8e7b0 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -765,7 +765,7 @@ int o_net_add_busrippers(TOPLEVEL *w_current, OBJECT *net_obj,
done = TRUE;
}
- cl_current2 = cl_current2->next;
+ cl_current2 = g_list_next(cl_current2);
}
if (!found_conn) {
@@ -988,7 +988,7 @@ int o_net_add_busrippers(TOPLEVEL *w_current, OBJECT *net_obj,
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
if (made_changes) {
diff --git a/gschem/src/o_picture.c b/gschem/src/o_picture.c
index 5a6c7d7..b0462e3 100644
--- a/gschem/src/o_picture.c
+++ b/gschem/src/o_picture.c
@@ -690,7 +690,7 @@ void o_picture_exchange (TOPLEVEL *w_current, GdkPixbuf *pixbuf,
o_picture_draw(w_current, object);
}
}
- list = list->next;
+ list = g_list_next(list);
}
}
diff --git a/gschem/src/o_select.c b/gschem/src/o_select.c
index 388e268..ecac644 100644
--- a/gschem/src/o_select.c
+++ b/gschem/src/o_select.c
@@ -474,6 +474,6 @@ o_select_move_to_place_list(TOPLEVEL *w_current)
w_current->page_current->complex_place_list = g_list_append(w_current->page_current->complex_place_list,
o_current);
}
- selection = selection->next;
+ selection = g_list_next(selection);
}
}
diff --git a/gschem/src/o_text.c b/gschem/src/o_text.c
index e2718d0..2fecb84 100644
--- a/gschem/src/o_text.c
+++ b/gschem/src/o_text.c
@@ -536,7 +536,7 @@ void o_text_edit_end(TOPLEVEL *w_current, char *string, int len, int text_size,
}
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
w_current->page_current->CHANGED = 1;
diff --git a/gschem/src/x_attribedit.c b/gschem/src/x_attribedit.c
index cfcff5b..97a5c42 100644
--- a/gschem/src/x_attribedit.c
+++ b/gschem/src/x_attribedit.c
@@ -148,7 +148,7 @@ void attrib_edit_dialog_ok(GtkWidget * w, TOPLEVEL * w_current)
if (!object->attached_to) {
nsel++;
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
s_current = geda_list_get_glist( w_current->page_current->selection_list );
if (nsel > 1) {
@@ -222,7 +222,7 @@ void attrib_edit_dialog_ok(GtkWidget * w, TOPLEVEL * w_current)
}
}
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
o_undo_savestate(w_current, UNDO_ALL);
} else {
@@ -324,7 +324,7 @@ void attrib_edit_dialog(TOPLEVEL * w_current, OBJECT * list, int flag)
/* gschem specific: What do we count here? (Werner) */
for (s_current = geda_list_get_glist( w_current->page_current->selection_list );
s_current != NULL;
- s_current = s_current->next) {
+ s_current = g_list_next(s_current)) {
if (!((OBJECT *) s_current->data)->attached_to) {
nsel++;
}
diff --git a/gschem/src/x_dialog.c b/gschem/src/x_dialog.c
index f6b4aff..ac78d81 100644
--- a/gschem/src/x_dialog.c
+++ b/gschem/src/x_dialog.c
@@ -812,7 +812,7 @@ static void line_type_dialog_ok(GtkWidget *w, gpointer data)
space == -1 ? o_current->line_space : space);
o_redraw_single (toplevel, o_current);
- object = object->next;
+ object = g_list_next(object);
}
}
@@ -1197,7 +1197,7 @@ static void fill_type_dialog_ok(GtkWidget *w, gpointer data)
angle2 == -1 ? o_current->fill_angle2 : angle2);
o_redraw_single (toplevel, o_current);
- object = object->next;
+ object = g_list_next(object);
}
}
toplevel->page_current->CHANGED = 1;
@@ -2382,7 +2382,7 @@ void color_edit_dialog_apply(GtkWidget *w, TOPLEVEL *w_current)
break;
}
- s_current = s_current->next;
+ s_current = g_list_next(s_current);
}
o_undo_savestate(w_current, UNDO_ALL);
}
@@ -3251,7 +3251,7 @@ void major_changed_dialog(TOPLEVEL* w_current)
refdes_string = tmp;
}
- current = current->next;
+ current = g_list_next(current);
}
tmp = g_strconcat (refdes_string,
diff --git a/gschem/src/x_window.c b/gschem/src/x_window.c
index fac1355..8db910b 100644
--- a/gschem/src/x_window.c
+++ b/gschem/src/x_window.c
@@ -689,7 +689,7 @@ void x_window_close(TOPLEVEL *w_current)
{
/* printf("yeah freeing: %s\n", (char*) current->data); */
g_free(current->data);
- current = current->next;
+ current = g_list_next(current);
}
g_list_free(w_current->major_changed_refdes);
}
diff --git a/gsymcheck/src/s_check.c b/gsymcheck/src/s_check.c
index 2156254..29f964f 100644
--- a/gsymcheck/src/s_check.c
+++ b/gsymcheck/src/s_check.c
@@ -331,7 +331,7 @@ s_check_pinseq(OBJECT *object_head, SYMCHECK *s_current)
found++;
}
- ptr2 = ptr2->next;
+ ptr2 = g_list_next(ptr2);
}
if (found > 1)
@@ -345,14 +345,14 @@ s_check_pinseq(OBJECT *object_head, SYMCHECK *s_current)
s_current->duplicate_pinseq_attrib++;
}
- ptr1 = ptr1->next;
+ ptr1 = g_list_next(ptr1);
}
ptr1 = found_numbers;
while (ptr1)
{
g_free(ptr1->data);
- ptr1 = ptr1->next;
+ ptr1 = g_list_next(ptr1);
}
g_list_free(found_numbers);
@@ -534,7 +534,7 @@ s_check_pinnumber(OBJECT *object_head, SYMCHECK *s_current)
found++;
}
- ptr2 = ptr2->next;
+ ptr2 = g_list_next(ptr2);
}
if (found > 1)
@@ -548,14 +548,14 @@ s_check_pinnumber(OBJECT *object_head, SYMCHECK *s_current)
s_current->duplicate_pinnumber_attrib++;
}
- ptr1 = ptr1->next;
+ ptr1 = g_list_next(ptr1);
}
ptr1 = found_numbers;
while (ptr1)
{
g_free(ptr1->data);
- ptr1 = ptr1->next;
+ ptr1 = g_list_next(ptr1);
}
g_list_free(found_numbers);
diff --git a/gsymcheck/src/s_symstruct.c b/gsymcheck/src/s_symstruct.c
index 5c10d8f..b5a0aaa 100644
--- a/gsymcheck/src/s_symstruct.c
+++ b/gsymcheck/src/s_symstruct.c
@@ -102,7 +102,7 @@ s_symstruct_print(SYMCHECK *s_current)
g_free(msg);
}
- list = list->next;
+ list = g_list_next(list);
}
}
@@ -117,7 +117,7 @@ s_symstruct_print(SYMCHECK *s_current)
g_free(msg);
}
- list = list->next;
+ list = g_list_next(list);
}
}
@@ -132,7 +132,7 @@ s_symstruct_print(SYMCHECK *s_current)
g_free(msg);
}
- list = list->next;
+ list = g_list_next(list);
}
}
}
diff --git a/libgeda/src/o_basic.c b/libgeda/src/o_basic.c
index 083e2a0..fa0b7c8 100644
--- a/libgeda/src/o_basic.c
+++ b/libgeda/src/o_basic.c
@@ -181,7 +181,7 @@ o_recalc_object_glist(TOPLEVEL *toplevel, GList *object_glist)
while (list != NULL) {
o_current = (OBJECT *) list->data;
o_recalc_single_object(toplevel, o_current);
- list = list->next;
+ list = g_list_next(list);
}
}
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 83da47d..699a2d3 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -180,7 +180,7 @@ int world_get_object_glist_bounds(TOPLEVEL *toplevel, GList *head,
found = 1;
}
}
- s_current = s_current->next;
+ s_current = g_list_next (s_current);
}
return found;
}
@@ -525,17 +525,17 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
glist_ptr = *object_glist;
while (glist_ptr) {
- if (glist_ptr->prev == NULL) {
+ if (g_list_previous(glist_ptr) == NULL) {
((OBJECT *) glist_ptr->data)->prev = NULL;
} else {
- ((OBJECT *) glist_ptr->data)->prev = glist_ptr->prev->data;
+ ((OBJECT *) glist_ptr->data)->prev = g_list_previous (glist_ptr)->data;
}
- if (glist_ptr->next == NULL) {
+ if (g_list_next(glist_ptr) == NULL) {
((OBJECT *) glist_ptr->data)->next = NULL;
} else {
- ((OBJECT *) glist_ptr->data)->next = glist_ptr->next->data;
+ ((OBJECT *) glist_ptr->data)->next = g_list_next (glist_ptr)->data;
}
- glist_ptr = glist_ptr->next;
+ glist_ptr = g_list_next (glist_ptr);
}
o_attrib_attach (toplevel, ((OBJECT *) g_list_last(*object_glist)->data),
@@ -577,17 +577,17 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
glist_ptr = *object_glist;
while (glist_ptr) {
- if (glist_ptr->prev == NULL) {
+ if (g_list_previous (glist_ptr) == NULL) {
((OBJECT *) glist_ptr->data)->prev = NULL;
} else {
- ((OBJECT *) glist_ptr->data)->prev = glist_ptr->prev->data;
+ ((OBJECT *) glist_ptr->data)->prev = g_list_previous(glist_ptr)->data;
}
- if (glist_ptr->next == NULL) {
+ if (g_list_next (glist_ptr) == NULL) {
((OBJECT *) glist_ptr->data)->next = NULL;
} else {
- ((OBJECT *) glist_ptr->data)->next = glist_ptr->next->data;
+ ((OBJECT *) glist_ptr->data)->next = g_list_next(glist_ptr)->data;
}
- glist_ptr = glist_ptr->next;
+ glist_ptr = g_list_next(glist_ptr);
}
object_list = (OBJECT *) (g_list_last(*object_glist)->data);
} else {
diff --git a/libgeda/src/o_list.c b/libgeda/src/o_list.c
index ddf7f1e..15de6b2 100644
--- a/libgeda/src/o_list.c
+++ b/libgeda/src/o_list.c
@@ -303,7 +303,7 @@ OBJECT *o_list_copy_all_selection2(TOPLEVEL *toplevel,
/* reselect it */
o_selection_select(object, SELECT_COLOR);
- src = src->next;
+ src = g_list_next(src);
}
src = src_list_head;
@@ -347,7 +347,7 @@ OBJECT *o_list_copy_all_selection2(TOPLEVEL *toplevel,
/* reselect it */
o_selection_select(object, SELECT_COLOR);
- src = src->next;
+ src = g_list_next(src);
}
/* Clean up dangling ATTRIB.copied_to pointers */
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index e44b93b..572e711 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -559,7 +559,7 @@ int o_net_consolidate_nomidpoint(OBJECT *object, int x, int y)
}
}
- c_current = c_current->next;
+ c_current = g_list_next(c_current);
}
return(TRUE);
@@ -640,7 +640,7 @@ int o_net_consolidate_segments(TOPLEVEL *toplevel, OBJECT *object)
}
- c_current = c_current->next;
+ c_current = g_list_next (c_current);
}
return(0);
diff --git a/libgeda/src/o_selection.c b/libgeda/src/o_selection.c
index 25fd075..f890702 100644
--- a/libgeda/src/o_selection.c
+++ b/libgeda/src/o_selection.c
@@ -126,7 +126,7 @@ void o_selection_print_all(const SELECTION *selection)
if (s_current->data) {
printf("Selected object: %d\n", ((OBJECT *)s_current->data)->sid );
}
- s_current = s_current->next;
+ s_current = g_list_next( s_current );
}
printf("DONE printing selection ********************\n");
printf("\n");
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index ba0f74b..7668555 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -558,7 +558,7 @@ s_delete_object_glist(TOPLEVEL *toplevel, GList *list)
while(ptr != NULL) {
o_current = (OBJECT *) ptr->data;
s_delete_object(toplevel, o_current);
- ptr = ptr->prev;
+ ptr = g_list_previous (ptr);
}
g_list_free(list);
}
diff --git a/libgeda/src/s_conn.c b/libgeda/src/s_conn.c
index 669c704..ca9a1c1 100644
--- a/libgeda/src/s_conn.c
+++ b/libgeda/src/s_conn.c
@@ -94,7 +94,7 @@ int s_conn_uniq(GList * conn_list, CONN * input_conn)
return (FALSE);
}
- c_current = c_current->next;
+ c_current = g_list_next(c_current);
}
return (TRUE);
@@ -142,7 +142,7 @@ int s_conn_remove_other(TOPLEVEL * toplevel, OBJECT * other_object,
return (TRUE);
}
- c_current = c_current->next;
+ c_current = g_list_next(c_current);
}
return (FALSE);
@@ -183,7 +183,7 @@ void s_conn_remove(TOPLEVEL * toplevel, OBJECT * to_remove)
#endif
c_current->data = NULL;
g_free(conn);
- c_current = c_current->next;
+ c_current = g_list_next(c_current);
}
#if DEBUG
@@ -684,10 +684,10 @@ void s_conn_update_object(TOPLEVEL * toplevel, OBJECT * object)
} /* end of for over endpoints */
- object_list = object_list->next;
+ object_list = g_list_next(object_list);
}
- tloc_list = tloc_list->next;
+ tloc_list = g_list_next(tloc_list);
}
#if DEBUG
@@ -742,7 +742,7 @@ void s_conn_print(GList * conn_list)
printf("other_whichone: %d\n", conn->other_whichone);
printf("-----------------------------------\n");
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
}
@@ -774,7 +774,7 @@ int s_conn_net_search(OBJECT* new_net, int whichone, GList * conn_list)
return TRUE;
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
return FALSE;
@@ -805,7 +805,7 @@ GList *s_conn_return_others(GList *input_list, OBJECT *object)
return_list = g_list_append(return_list, conn->other_object);
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
return(return_list);
@@ -843,7 +843,7 @@ GList *s_conn_return_complex_others(GList *input_list, OBJECT *object)
return_list = g_list_append(return_list, conn->other_object);
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
o_current = o_current->next;
diff --git a/libgeda/src/s_cue.c b/libgeda/src/s_cue.c
index 9f77e96..d0341cf 100644
--- a/libgeda/src/s_cue.c
+++ b/libgeda/src/s_cue.c
@@ -182,7 +182,7 @@ void s_cue_output_lowlevel(TOPLEVEL * toplevel, OBJECT * object, int whichone,
}
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
#if DEBUG
@@ -264,7 +264,7 @@ void s_cue_output_lowlevel_midpoints(TOPLEVEL * toplevel, OBJECT * object,
}
- cl_current = cl_current->next;
+ cl_current = g_list_next(cl_current);
}
}
diff --git a/libgeda/src/s_tile.c b/libgeda/src/s_tile.c
index 270e775..3ad2a7f 100644
--- a/libgeda/src/s_tile.c
+++ b/libgeda/src/s_tile.c
@@ -394,7 +394,7 @@ void s_tile_remove_object_all(TOPLEVEL * toplevel, PAGE *p_current,
}
#endif
- tloc_list = tloc_list->next;
+ tloc_list = g_list_next(tloc_list);
}
g_list_free(tloc_list);
@@ -443,10 +443,10 @@ void s_tile_print(TOPLEVEL * toplevel)
while (temp2 != NULL) {
tloc = (TILE_LOC *) temp2->data;
printf(" %d %d\n", tloc->i, tloc->j);
- temp2 = temp2->next;
+ temp2 = g_list_next(temp2);
}
- temp = temp->next;
+ temp = g_list_next(temp);
}
printf("------------------\n");
diff --git a/utils/src/gsch2pcb.c b/utils/src/gsch2pcb.c
index 843fad2..de3de1f 100644
--- a/utils/src/gsch2pcb.c
+++ b/utils/src/gsch2pcb.c
@@ -245,7 +245,7 @@ run_gnetlist(gchar *pins_file, gchar *net_file, gchar *pcb_file, gchar *basename
if (m4_override_file)
unlink(m4_override_file);
- for (list = extra_gnetlist_list; list; list = list->next)
+ for (list = extra_gnetlist_list; list; list = g_list_next(list))
{
s = (gchar *) list->data;
if (!strstr(s, " -o "))
@@ -465,7 +465,7 @@ pcb_element_exists(PcbElement *el_test, gboolean record)
GList *list;
PcbElement *el;
- for (list = pcb_element_list; list; list = list->next)
+ for (list = pcb_element_list; list; list = g_list_next(list))
{
el = (PcbElement *) list->data;
@@ -660,7 +660,7 @@ search_element_directories( PcbElement *el)
if (verbose > 1)
printf("\tSearching directories looking for file element: %s\n",
elname);
- for (list = element_directory_list; list; list = list->next)
+ for (list = element_directory_list; list; list = g_list_next(list))
{
dir_path = (gchar *) list->data;
if (verbose > 1)
@@ -929,7 +929,7 @@ update_element_descriptions(gchar *pcb_file, gchar *bak)
PcbElement *el, *el_exists;
gchar *fmt, *command, *tmp, *s, buf[1024];
- for (list = pcb_element_list; list; list = list->next)
+ for (list = pcb_element_list; list; list = g_list_next(list))
{
el = (PcbElement *) list->data;
if (el->changed_description)
@@ -1000,7 +1000,7 @@ prune_elements(gchar *pcb_file, gchar *bak)
gint paren_level = 0;
gboolean skipping = FALSE;
- for (list = pcb_element_list; list; list = list->next)
+ for (list = pcb_element_list; list; list = g_list_next(list))
{
el = (PcbElement *) list->data;
if (!el->still_exists)
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs