[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-399-g4abd473)
The branch, master has been updated
via 4abd473222827786c2480fa128464c7ff45448ea (commit)
from 6e8f757d3aa23219bb0259064dbed5ffa64fb341 (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
=========
gschem/src/o_bus.c | 10 +++++-----
gschem/src/o_delete.c | 10 +++++-----
gschem/src/o_grips.c | 36 ++++++++++++++++++------------------
gschem/src/o_misc.c | 24 ++++++++++++------------
gschem/src/o_move.c | 42 +++++++++++++++++++++---------------------
gschem/src/o_net.c | 44 ++++++++++++++++++++++----------------------
gschem/src/o_pin.c | 10 +++++-----
7 files changed, 88 insertions(+), 88 deletions(-)
=================
Commit Messages
=================
commit 4abd473222827786c2480fa128464c7ff45448ea
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Fri Dec 19 23:25:48 2008 +0000
gschem: Rename "other_objects" to "prev_conn_objects" for clarity
:100644 100644 7e9587b... dae8067... M gschem/src/o_bus.c
:100644 100644 cdd545f... 0ab6aaa... M gschem/src/o_delete.c
:100644 100644 3eaea0b... 0634fc1... M gschem/src/o_grips.c
:100644 100644 2fdd827... cdf2231... M gschem/src/o_misc.c
:100644 100644 1782b7c... 6e2883e... M gschem/src/o_move.c
:100644 100644 3546ad1... c9fd2fd... M gschem/src/o_net.c
:100644 100644 3af2e65... 9a08100... M gschem/src/o_pin.c
=========
Changes
=========
commit 4abd473222827786c2480fa128464c7ff45448ea
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Fri Dec 19 23:25:48 2008 +0000
gschem: Rename "other_objects" to "prev_conn_objects" for clarity
diff --git a/gschem/src/o_bus.c b/gschem/src/o_bus.c
index 7e9587b..dae8067 100644
--- a/gschem/src/o_bus.c
+++ b/gschem/src/o_bus.c
@@ -235,7 +235,7 @@ int o_bus_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
TOPLEVEL *toplevel = w_current->toplevel;
OBJECT *new_obj;
int color;
- GList *other_objects = NULL;
+ GList *prev_conn_objects = NULL;
g_assert( w_current->inside_action != 0 );
@@ -264,10 +264,10 @@ int o_bus_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
o_bus_draw(w_current, new_obj);
/* connect the new bus to the other busses */
- other_objects = s_conn_return_others (other_objects, new_obj);
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
- g_list_free(other_objects);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, new_obj);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
+ g_list_free (prev_conn_objects);
o_cue_draw_single (w_current, new_obj);
toplevel->page_current->CHANGED=1;
diff --git a/gschem/src/o_delete.c b/gschem/src/o_delete.c
index cdd545f..0ab6aaa 100644
--- a/gschem/src/o_delete.c
+++ b/gschem/src/o_delete.c
@@ -38,7 +38,7 @@
void o_delete (GSCHEM_TOPLEVEL *w_current, OBJECT *object)
{
TOPLEVEL *toplevel = w_current->toplevel;
- GList *other_objects = NULL;
+ GList *prev_conn_objects = NULL;
gboolean do_conn;
g_return_if_fail (object != NULL);
@@ -49,7 +49,7 @@ void o_delete (GSCHEM_TOPLEVEL *w_current, OBJECT *object)
if (do_conn) {
o_cue_undraw (w_current, object);
- other_objects = s_conn_return_others (other_objects, object);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, object);
}
o_erase_single (w_current, object);
o_erase_grips (w_current, object);
@@ -58,9 +58,9 @@ void o_delete (GSCHEM_TOPLEVEL *w_current, OBJECT *object)
s_delete_object (toplevel, object);
if (do_conn) {
- o_cue_undraw_list (w_current, other_objects);
- o_cue_draw_list (w_current, other_objects);
- g_list_free (other_objects);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
+ g_list_free (prev_conn_objects);
}
toplevel->page_current->CHANGED = 1;
diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index 3eaea0b..0634fc1 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -1338,7 +1338,7 @@ void o_grips_end_line(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichon
void o_grips_end_net(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone)
{
TOPLEVEL *toplevel = w_current->toplevel;
- GList *other_objects = NULL;
+ GList *prev_conn_objects = NULL;
GList *connected_objects = NULL;
/* erase the temporary line */
@@ -1357,7 +1357,7 @@ void o_grips_end_net(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
o_cue_undraw(w_current, o_current);
o_erase_single(w_current, o_current);
- other_objects = s_conn_return_others(other_objects, o_current);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, o_current);
s_conn_remove_object (toplevel, o_current);
o_net_modify (toplevel, o_current, w_current->second_wx,
@@ -1378,8 +1378,8 @@ void o_grips_end_net(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
}
/* draw the object objects */
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
o_redraw_single(w_current, o_current);
@@ -1395,8 +1395,8 @@ void o_grips_end_net(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
/* finally draw this objects cues */
o_cue_draw_single(w_current, o_current);
- g_list_free(other_objects);
- other_objects = NULL;
+ g_list_free (prev_conn_objects);
+ prev_conn_objects = NULL;
g_list_free(connected_objects);
connected_objects = NULL;
}
@@ -1420,7 +1420,7 @@ void o_grips_end_net(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
void o_grips_end_pin(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone)
{
TOPLEVEL *toplevel = w_current->toplevel;
- GList *other_objects = NULL;
+ GList *prev_conn_objects = NULL;
GList *connected_objects = NULL;
/* erase the temporary line */
@@ -1439,7 +1439,7 @@ void o_grips_end_pin(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
o_cue_undraw(w_current, o_current);
o_erase_single(w_current, o_current);
- other_objects = s_conn_return_others(other_objects, o_current);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, o_current);
s_conn_remove_object (toplevel, o_current);
o_pin_modify (toplevel, o_current, w_current->second_wx,
@@ -1448,8 +1448,8 @@ void o_grips_end_pin(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
o_redraw_single(w_current, o_current);
/* redraw the object connections */
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
/* get the other connected objects and redraw them */
connected_objects = s_conn_return_others(connected_objects,
@@ -1461,8 +1461,8 @@ void o_grips_end_pin(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
o_cue_draw_single(w_current, o_current);
/* free the two lists */
- g_list_free(other_objects);
- other_objects = NULL;
+ g_list_free (prev_conn_objects);
+ prev_conn_objects = NULL;
g_list_free(connected_objects);
connected_objects = NULL;
}
@@ -1486,7 +1486,7 @@ void o_grips_end_pin(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
void o_grips_end_bus(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone)
{
TOPLEVEL *toplevel = w_current->toplevel;
- GList *other_objects = NULL;
+ GList *prev_conn_objects = NULL;
GList *connected_objects = NULL;
/* erase the temporary line */
@@ -1505,7 +1505,7 @@ void o_grips_end_bus(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
o_cue_undraw(w_current, o_current);
o_erase_single(w_current, o_current);
- other_objects = s_conn_return_others(other_objects, o_current);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, o_current);
s_conn_remove_object (toplevel, o_current);
o_bus_modify (toplevel, o_current, w_current->second_wx,
@@ -1514,8 +1514,8 @@ void o_grips_end_bus(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
o_redraw_single(w_current, o_current);
/* redraw the connected objects */
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
/* get the other connected objects and redraw them */
connected_objects = s_conn_return_others(connected_objects,
@@ -1527,8 +1527,8 @@ void o_grips_end_bus(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
o_cue_draw_single(w_current, o_current);
/* free the two lists */
- g_list_free(other_objects);
- other_objects = NULL;
+ g_list_free (prev_conn_objects);
+ prev_conn_objects = NULL;
g_list_free(connected_objects);
connected_objects = NULL;
}
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index 2fdd827..cdf2231 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -191,7 +191,7 @@ void o_rotate_world_update(GSCHEM_TOPLEVEL *w_current,
TOPLEVEL *toplevel = w_current->toplevel;
OBJECT *o_current;
GList *o_iter;
- GList *other_objects=NULL;
+ GList *prev_conn_objects=NULL;
GList *connected_objects=NULL;
/* this is okay if you just hit rotate and have nothing selected */
@@ -213,7 +213,7 @@ void o_rotate_world_update(GSCHEM_TOPLEVEL *w_current,
for (o_iter = list; o_iter != NULL; o_iter = g_list_next (o_iter)) {
o_current = o_iter->data;
- other_objects = s_conn_return_others (other_objects, o_current);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, o_current);
s_conn_remove_object (toplevel, o_current);
}
@@ -232,15 +232,15 @@ void o_rotate_world_update(GSCHEM_TOPLEVEL *w_current,
if (!toplevel->DONT_REDRAW) {
o_draw_list (w_current, list);
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
o_cue_undraw_list(w_current, connected_objects);
o_cue_draw_list(w_current, connected_objects);
o_cue_draw_list(w_current, list);
}
- g_list_free (other_objects);
- other_objects = NULL;
+ g_list_free (prev_conn_objects);
+ prev_conn_objects = NULL;
g_list_free (connected_objects);
connected_objects = NULL;
@@ -298,7 +298,7 @@ void o_mirror_world_update(GSCHEM_TOPLEVEL *w_current, int centerx, int centery,
TOPLEVEL *toplevel = w_current->toplevel;
OBJECT *o_current;
GList *o_iter;
- GList *other_objects=NULL;
+ GList *prev_conn_objects=NULL;
GList *connected_objects=NULL;
if (list == NULL) {
@@ -317,7 +317,7 @@ void o_mirror_world_update(GSCHEM_TOPLEVEL *w_current, int centerx, int centery,
for (o_iter = list; o_iter != NULL; o_iter = g_list_next (o_iter)) {
o_current = o_iter->data;
- other_objects = s_conn_return_others (other_objects, o_current);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, o_current);
s_conn_remove_object (toplevel, o_current);
}
@@ -335,14 +335,14 @@ void o_mirror_world_update(GSCHEM_TOPLEVEL *w_current, int centerx, int centery,
}
o_draw_list (w_current, list);
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
o_cue_undraw_list(w_current, connected_objects);
o_cue_draw_list(w_current, connected_objects);
o_cue_draw_list(w_current, list);
- g_list_free (other_objects);
- other_objects = NULL;
+ g_list_free (prev_conn_objects);
+ prev_conn_objects = NULL;
g_list_free (connected_objects);
connected_objects = NULL;
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index 1782b7c..6e2883e 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -78,7 +78,7 @@ void o_move_start(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
static void o_move_end_lowlevel_glist (GSCHEM_TOPLEVEL *w_current,
GList *list,
int diff_x, int diff_y,
- GList** other_objects,
+ GList** prev_conn_objects,
GList** connected_objects)
{
OBJECT *object;
@@ -88,7 +88,7 @@ static void o_move_end_lowlevel_glist (GSCHEM_TOPLEVEL *w_current,
while (iter != NULL) {
object = (OBJECT *)iter->data;
o_move_end_lowlevel (w_current, object, diff_x, diff_y,
- other_objects, connected_objects);
+ prev_conn_objects, connected_objects);
iter = g_list_next (iter);
}
}
@@ -102,7 +102,7 @@ static void o_move_end_lowlevel_glist (GSCHEM_TOPLEVEL *w_current,
void o_move_end_lowlevel (GSCHEM_TOPLEVEL *w_current,
OBJECT *object,
int diff_x, int diff_y,
- GList** other_objects,
+ GList** prev_conn_objects,
GList** connected_objects)
{
TOPLEVEL *toplevel = w_current->toplevel;
@@ -113,7 +113,7 @@ void o_move_end_lowlevel (GSCHEM_TOPLEVEL *w_current,
case (OBJ_BUS):
case (OBJ_PIN):
/* save the other objects and remove object's connections */
- *other_objects = s_conn_return_others (*other_objects, object);
+ *prev_conn_objects = s_conn_return_others (*prev_conn_objects, object);
s_conn_remove_object (toplevel, object);
/* do the actual translation */
@@ -141,10 +141,10 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current)
int diff_x, diff_y;
int left, top, right, bottom;
GList *s_iter;
- GList *other_objects = NULL;
+ GList *prev_conn_objects = NULL;
GList *connected_objects = NULL;
GList *rubbernet_objects = NULL;
- GList *rubbernet_other_objects = NULL;
+ GList *rubbernet_prev_conn_objects = NULL;
GList *rubbernet_connected_objects = NULL;
object = o_select_return_first_object(w_current);
@@ -164,7 +164,7 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current)
if (w_current->netconn_rubberband) {
o_move_end_rubberband(w_current, diff_x, diff_y,
- &rubbernet_objects, &rubbernet_other_objects,
+ &rubbernet_objects, &rubbernet_prev_conn_objects,
&rubbernet_connected_objects);
}
@@ -209,7 +209,7 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current)
o_move_end_lowlevel_glist (w_current, object->complex->prim_objs,
diff_x, diff_y,
- &other_objects, &connected_objects);
+ &prev_conn_objects, &connected_objects);
world_get_object_glist_bounds (toplevel, object->complex->prim_objs,
@@ -224,7 +224,7 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current)
default:
o_move_end_lowlevel (w_current, object, diff_x, diff_y,
- &other_objects, &connected_objects);
+ &prev_conn_objects, &connected_objects);
break;
}
@@ -236,8 +236,8 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current)
/* Draw the objects that were moved (and connected/disconnected objects) */
o_draw_selected(w_current);
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
+ o_cue_undraw_list(w_current, prev_conn_objects);
+ o_cue_draw_list(w_current, prev_conn_objects);
o_cue_undraw_list(w_current, connected_objects);
o_cue_draw_list(w_current, connected_objects);
@@ -245,18 +245,18 @@ void o_move_end(GSCHEM_TOPLEVEL *w_current)
o_draw_list(w_current, rubbernet_objects);
o_cue_undraw_list(w_current, rubbernet_objects);
o_cue_draw_list(w_current, rubbernet_objects);
- o_cue_undraw_list(w_current, rubbernet_other_objects);
- o_cue_draw_list(w_current, rubbernet_other_objects);
+ o_cue_undraw_list(w_current, rubbernet_prev_conn_objects);
+ o_cue_draw_list(w_current, rubbernet_prev_conn_objects);
o_cue_undraw_list(w_current, rubbernet_connected_objects);
o_cue_draw_list(w_current, rubbernet_connected_objects);
toplevel->page_current->CHANGED = 1;
o_undo_savestate(w_current, UNDO_ALL);
- g_list_free(other_objects);
+ g_list_free(prev_conn_objects);
g_list_free(connected_objects);
g_list_free(rubbernet_objects);
- g_list_free(rubbernet_other_objects);
+ g_list_free(rubbernet_prev_conn_objects);
g_list_free(rubbernet_connected_objects);
g_list_free(toplevel->page_current->place_list);
@@ -497,7 +497,7 @@ int o_move_zero_length(OBJECT * object)
void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
int world_diff_y,
GList** objects,
- GList** other_objects, GList** connected_objects)
+ GList** prev_conn_objects, GList** connected_objects)
{
TOPLEVEL *toplevel = w_current->toplevel;
GList *s_iter;
@@ -514,8 +514,8 @@ void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
case (OBJ_NET):
/* save the other objects and remove object's connections */
- *other_objects =
- s_conn_return_others(*other_objects, object);
+ *prev_conn_objects =
+ s_conn_return_others (*prev_conn_objects, object);
s_conn_remove_object (toplevel, object);
x = object->line->x[whichone];
@@ -559,8 +559,8 @@ void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
case (OBJ_BUS):
/* save the other objects and remove object's connections */
- *other_objects =
- s_conn_return_others(*other_objects, object);
+ *prev_conn_objects =
+ s_conn_return_others (*prev_conn_objects, object);
s_conn_remove_object (toplevel, object);
x = object->line->x[whichone];
@@ -597,7 +597,7 @@ void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
#if DEBUG
/*! \bug FIXME: moved_objects doesn't exist? */
/*printf("%d\n", g_list_length(*moved_objects));*/
- printf("%d\n", g_list_length(*other_objects));
+ printf("%d\n", g_list_length(*prev_conn_objects));
printf("%d\n", g_list_length(*connected_objects));
#endif
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index 3546ad1..c9fd2fd 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -662,7 +662,7 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
int found_primary_connection = FALSE;
int save_magnetic, save_wx, save_wy;
- GList *other_objects = NULL;
+ GList *prev_conn_objects = NULL;
OBJECT *new_net = NULL;
g_assert( w_current->inside_action != 0 );
@@ -712,12 +712,12 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
/* conn stuff */
/* LEAK CHECK 1 */
- other_objects = s_conn_return_others (other_objects, new_net);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, new_net);
- if (o_net_add_busrippers(w_current, new_net, other_objects)) {
- g_list_free(other_objects);
- other_objects = NULL;
- other_objects = s_conn_return_others(other_objects, new_net);
+ if (o_net_add_busrippers (w_current, new_net, prev_conn_objects)) {
+ g_list_free (prev_conn_objects);
+ prev_conn_objects = NULL;
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, new_net);
}
#if DEBUG
@@ -727,12 +727,12 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
o_redraw_single (w_current, new_net);
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
o_cue_draw_single(w_current, new_net);
- g_list_free(other_objects);
- other_objects = NULL;
+ g_list_free (prev_conn_objects);
+ prev_conn_objects = NULL;
/* Go off and search for valid connection on this newly created net */
found_primary_connection = s_conn_net_search(new_net, 1,
@@ -765,12 +765,12 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
/* conn stuff */
/* LEAK CHECK 2 */
- other_objects = s_conn_return_others (other_objects, new_net);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, new_net);
- if (o_net_add_busrippers(w_current, new_net, other_objects)) {
- g_list_free(other_objects);
- other_objects = NULL;
- other_objects = s_conn_return_others(other_objects, new_net);
+ if (o_net_add_busrippers (w_current, new_net, prev_conn_objects)) {
+ g_list_free (prev_conn_objects);
+ prev_conn_objects = NULL;
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, new_net);
}
#if DEBUG
s_conn_print(new_net->conn_list);
@@ -778,12 +778,12 @@ int o_net_end(GSCHEM_TOPLEVEL *w_current, int w_x, int w_y)
o_redraw_single (w_current, new_net);
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
o_cue_draw_single(w_current, new_net);
- g_list_free(other_objects);
- other_objects = NULL;
+ g_list_free (prev_conn_objects);
+ prev_conn_objects = NULL;
/* you don't want to consolidate nets which are drawn non-ortho */
if (toplevel->net_consolidate == TRUE && !w_current->CONTROLKEY) {
@@ -1026,7 +1026,7 @@ void o_net_eraserubber(GSCHEM_TOPLEVEL *w_current)
*
*/
int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj,
- GList *other_objects)
+ GList *prev_conn_objects)
{
TOPLEVEL *toplevel = w_current->toplevel;
@@ -1051,7 +1051,7 @@ int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj,
length = o_line_length(net_obj);
- if (!other_objects) {
+ if (!prev_conn_objects) {
return(FALSE);
}
@@ -1067,7 +1067,7 @@ int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj,
/* check for a bus connection and draw rippers if so */
- cl_current = other_objects;
+ cl_current = prev_conn_objects;
while (cl_current != NULL) {
bus_object = (OBJECT *) cl_current->data;
diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index 3af2e65..9a08100 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -167,7 +167,7 @@ void o_pin_end(GSCHEM_TOPLEVEL *w_current, int x, int y)
TOPLEVEL *toplevel = w_current->toplevel;
OBJECT *new_obj;
int color;
- GList *other_objects = NULL;
+ GList *prev_conn_objects = NULL;
OBJECT *o_current, *o_current_pin;
g_assert( w_current->inside_action != 0 );
@@ -204,10 +204,10 @@ void o_pin_end(GSCHEM_TOPLEVEL *w_current, int x, int y)
}
/* look for connected objects */
- other_objects = s_conn_return_others(other_objects, o_current_pin);
- o_cue_undraw_list(w_current, other_objects);
- o_cue_draw_list(w_current, other_objects);
- g_list_free(other_objects);
+ prev_conn_objects = s_conn_return_others (prev_conn_objects, o_current_pin);
+ o_cue_undraw_list (w_current, prev_conn_objects);
+ o_cue_draw_list (w_current, prev_conn_objects);
+ g_list_free (prev_conn_objects);
o_cue_draw_single(w_current, o_current_pin);
o_pin_draw(w_current, o_current_pin);
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs