[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-364-gb211658)
The branch, master has been updated
via b211658fcddb84828c437a65bf6bd73fcc4b1918 (commit)
from ee0eaa9c885db7022b9cb5ef4ddf50b459fd92fc (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_complex.c | 8 ++++----
gschem/src/o_grips.c | 12 ++++++------
gschem/src/o_misc.c | 20 ++++++++++----------
gschem/src/o_move.c | 12 ++++++------
gschem/src/o_net.c | 4 ++--
gschem/src/o_place.c | 4 ++--
libgeda/include/prototype.h | 10 +++++-----
libgeda/src/o_bus_basic.c | 2 +-
libgeda/src/o_complex_basic.c | 2 +-
libgeda/src/o_net_basic.c | 6 +++---
libgeda/src/o_pin_basic.c | 2 +-
libgeda/src/s_basic.c | 2 +-
libgeda/src/s_conn.c | 23 ++++++++---------------
13 files changed, 50 insertions(+), 57 deletions(-)
=================
Commit Messages
=================
commit b211658fcddb84828c437a65bf6bd73fcc4b1918
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Dec 11 20:40:15 2008 +0000
Remove unused "toplevel" argument to s_conn_* functions
:100644 100644 37bfedd... 74f4445... M gschem/src/o_complex.c
:100644 100644 11dc1c3... 4c44f65... M gschem/src/o_grips.c
:100644 100644 a9bb436... a9cee55... M gschem/src/o_misc.c
:100644 100644 ade06f7... 845984f... M gschem/src/o_move.c
:100644 100644 e411773... d8d6af6... M gschem/src/o_net.c
:100644 100644 16581d0... 365b658... M gschem/src/o_place.c
:100644 100644 637a302... 5be1e04... M libgeda/include/prototype.h
:100644 100644 82e0369... 734a8f5... M libgeda/src/o_bus_basic.c
:100644 100644 dddf3cd... a07f15c... M libgeda/src/o_complex_basic.c
:100644 100644 0301704... 79e9b86... M libgeda/src/o_net_basic.c
:100644 100644 e9dfbb5... aec0077... M libgeda/src/o_pin_basic.c
:100644 100644 f337f16... aaee572... M libgeda/src/s_basic.c
:100644 100644 18dd0ed... 19d085b... M libgeda/src/s_conn.c
=========
Changes
=========
commit b211658fcddb84828c437a65bf6bd73fcc4b1918
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Thu Dec 11 20:40:15 2008 +0000
Remove unused "toplevel" argument to s_conn_* functions
diff --git a/gschem/src/o_complex.c b/gschem/src/o_complex.c
index 37bfedd..74f4445 100644
--- a/gschem/src/o_complex.c
+++ b/gschem/src/o_complex.c
@@ -255,9 +255,9 @@ void o_complex_translate_all(GSCHEM_TOPLEVEL *w_current, int offset)
while (iter != NULL) {
o_current = iter->data;
if (o_current->type != OBJ_COMPLEX && o_current->type != OBJ_PLACEHOLDER) {
- s_conn_remove(toplevel, o_current);
+ s_conn_remove (o_current);
} else {
- s_conn_remove_complex(toplevel, o_current);
+ s_conn_remove_complex (o_current);
}
iter = g_list_next (iter);
}
@@ -277,9 +277,9 @@ void o_complex_translate_all(GSCHEM_TOPLEVEL *w_current, int offset)
while (iter != NULL) {
o_current = iter->data;
if (o_current->type != OBJ_COMPLEX && o_current->type != OBJ_PLACEHOLDER) {
- s_conn_update_object(toplevel, o_current);
+ s_conn_update_object (o_current);
} else {
- s_conn_update_complex(toplevel, o_current->complex->prim_objs);
+ s_conn_update_complex (o_current->complex->prim_objs);
}
iter = g_list_next (iter);
}
diff --git a/gschem/src/o_grips.c b/gschem/src/o_grips.c
index 11dc1c3..4c44f65 100644
--- a/gschem/src/o_grips.c
+++ b/gschem/src/o_grips.c
@@ -1509,10 +1509,10 @@ void o_grips_end_net(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
other_objects = s_conn_return_others(other_objects, o_current);
- s_conn_remove(toplevel, o_current);
+ s_conn_remove (o_current);
o_net_modify (toplevel, o_current, w_current->second_wx,
w_current->second_wy, w_current->which_grip);
- s_conn_update_object(toplevel, o_current);
+ s_conn_update_object (o_current);
/* get the other connected objects and redraw them */
connected_objects = s_conn_return_others(connected_objects,
@@ -1591,10 +1591,10 @@ void o_grips_end_pin(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
other_objects = s_conn_return_others(other_objects, o_current);
- s_conn_remove(toplevel, o_current);
+ s_conn_remove (o_current);
o_pin_modify (toplevel, o_current, w_current->second_wx,
w_current->second_wy, w_current->which_grip);
- s_conn_update_object(toplevel, o_current);
+ s_conn_update_object (o_current);
o_redraw_single(w_current, o_current);
/* redraw the object connections */
@@ -1656,11 +1656,11 @@ void o_grips_end_bus(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current, int whichone
o_erase_single(w_current, o_current);
other_objects = s_conn_return_others(other_objects, o_current);
- s_conn_remove(toplevel, o_current);
+ s_conn_remove (o_current);
o_bus_modify (toplevel, o_current, w_current->second_wx,
w_current->second_wy, w_current->which_grip);
- s_conn_update_object(toplevel, o_current);
+ s_conn_update_object (o_current);
o_redraw_single(w_current, o_current);
/* redraw the connected objects */
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index a9bb436..a9cee55 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -218,13 +218,13 @@ void o_rotate_world_update(GSCHEM_TOPLEVEL *w_current,
case OBJ_PLACEHOLDER:
other_objects =
s_conn_return_complex_others(other_objects, o_current);
- s_conn_remove_complex (toplevel, o_current);
+ s_conn_remove_complex (o_current);
break;
case OBJ_NET:
case OBJ_PIN:
case OBJ_BUS:
other_objects = s_conn_return_others(other_objects, o_current);
- s_conn_remove (toplevel, o_current);
+ s_conn_remove (o_current);
break;
}
o_iter = g_list_next (o_iter);
@@ -242,14 +242,14 @@ void o_rotate_world_update(GSCHEM_TOPLEVEL *w_current,
switch (o_current->type) {
case OBJ_COMPLEX:
case OBJ_PLACEHOLDER:
- s_conn_update_complex(toplevel, o_current->complex->prim_objs);
+ s_conn_update_complex (o_current->complex->prim_objs);
connected_objects =
s_conn_return_complex_others(connected_objects, o_current);
break;
case OBJ_NET:
case OBJ_PIN:
case OBJ_BUS:
- s_conn_update_object(toplevel, o_current);
+ s_conn_update_object (o_current);
connected_objects = s_conn_return_others(connected_objects, o_current);
break;
}
@@ -348,13 +348,13 @@ void o_mirror_world_update(GSCHEM_TOPLEVEL *w_current, int centerx, int centery,
case OBJ_PLACEHOLDER:
other_objects =
s_conn_return_complex_others(other_objects, o_current);
- s_conn_remove_complex (toplevel, o_current);
+ s_conn_remove_complex (o_current);
break;
case OBJ_NET:
case OBJ_PIN:
case OBJ_BUS:
other_objects = s_conn_return_others(other_objects, o_current);
- s_conn_remove (toplevel, o_current);
+ s_conn_remove (o_current);
break;
}
o_iter = g_list_next (o_iter);
@@ -372,14 +372,14 @@ void o_mirror_world_update(GSCHEM_TOPLEVEL *w_current, int centerx, int centery,
switch (o_current->type) {
case OBJ_COMPLEX:
case OBJ_PLACEHOLDER:
- s_conn_update_complex(toplevel, o_current->complex->prim_objs);
+ s_conn_update_complex (o_current->complex->prim_objs);
connected_objects =
s_conn_return_complex_others(connected_objects, o_current);
break;
case OBJ_NET:
case OBJ_PIN:
case OBJ_BUS:
- s_conn_update_object(toplevel, o_current);
+ s_conn_update_object (o_current);
connected_objects = s_conn_return_others(connected_objects, o_current);
break;
}
@@ -759,7 +759,7 @@ void o_update_component(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
/* erase the complex object */
o_erase_single (w_current, o_current);
/* delete its connections */
- s_conn_remove_complex (toplevel, o_current);
+ s_conn_remove_complex (o_current);
/* and unselect it */
o_selection_remove( toplevel->page_current->selection_list, o_current);
@@ -841,7 +841,7 @@ void o_update_component(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
o_recalc_single_object(toplevel, o_current);
/* reconnect, re-select and redraw */
- s_conn_update_complex (toplevel, o_current->complex->prim_objs);
+ s_conn_update_complex (o_current->complex->prim_objs);
o_selection_add( toplevel->page_current->selection_list, o_current );
o_redraw_single (w_current, o_current);
diff --git a/gschem/src/o_move.c b/gschem/src/o_move.c
index ade06f7..845984f 100644
--- a/gschem/src/o_move.c
+++ b/gschem/src/o_move.c
@@ -114,11 +114,11 @@ void o_move_end_lowlevel (GSCHEM_TOPLEVEL *w_current,
case (OBJ_PIN):
/* save the other objects and remove object's connections */
*other_objects = s_conn_return_others (*other_objects, object);
- s_conn_remove (toplevel, object);
+ s_conn_remove (object);
/* do the actual translation */
o_translate_world (toplevel, diff_x, diff_y, object);
- s_conn_update_object (toplevel, object);
+ s_conn_update_object (object);
*connected_objects = s_conn_return_others (*connected_objects, object);
break;
@@ -520,7 +520,7 @@ void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
/* save the other objects and remove object's connections */
*other_objects =
s_conn_return_others(*other_objects, object);
- s_conn_remove(toplevel, object);
+ s_conn_remove (object);
x = object->line->x[whichone];
y = object->line->y[whichone];
@@ -546,7 +546,7 @@ void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
} else {
o_recalc_single_object(toplevel, object);
s_tile_update_object(toplevel, object);
- s_conn_update_object(toplevel, object);
+ s_conn_update_object (object);
*connected_objects =
s_conn_return_others(*connected_objects, object);
*objects = g_list_append(*objects, object);
@@ -565,7 +565,7 @@ void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
/* save the other objects and remove object's connections */
*other_objects =
s_conn_return_others(*other_objects, object);
- s_conn_remove(toplevel, object);
+ s_conn_remove (object);
x = object->line->x[whichone];
y = object->line->y[whichone];
@@ -588,7 +588,7 @@ void o_move_end_rubberband(GSCHEM_TOPLEVEL *w_current, int world_diff_x,
} else {
o_recalc_single_object(toplevel, object);
s_tile_update_object(toplevel, object);
- s_conn_update_object(toplevel, object);
+ s_conn_update_object (object);
*connected_objects =
s_conn_return_others(*connected_objects, object);
*objects = g_list_append(*objects, object);
diff --git a/gschem/src/o_net.c b/gschem/src/o_net.c
index e411773..d8d6af6 100644
--- a/gschem/src/o_net.c
+++ b/gschem/src/o_net.c
@@ -1354,7 +1354,7 @@ int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj,
}
if (made_changes) {
- s_conn_remove(toplevel, net_obj);
+ s_conn_remove (net_obj);
if (w_current->bus_ripper_type == COMP_BUS_RIPPER) {
GList *symlist =
@@ -1391,7 +1391,7 @@ int o_net_add_busrippers(GSCHEM_TOPLEVEL *w_current, OBJECT *net_obj,
}
}
- s_conn_update_object(toplevel, net_obj);
+ s_conn_update_object (net_obj);
return(TRUE);
}
diff --git a/gschem/src/o_place.c b/gschem/src/o_place.c
index 16581d0..365b658 100644
--- a/gschem/src/o_place.c
+++ b/gschem/src/o_place.c
@@ -103,11 +103,11 @@ void o_place_end (GSCHEM_TOPLEVEL *w_current,
/* Update object connectivity */
if (o_current->type == OBJ_COMPLEX || o_current->type == OBJ_PLACEHOLDER) {
- s_conn_update_complex(toplevel, o_current->complex->prim_objs);
+ s_conn_update_complex (o_current->complex->prim_objs);
connected_objects =
s_conn_return_complex_others (connected_objects, o_current);
} else {
- s_conn_update_object(toplevel, o_current);
+ s_conn_update_object (o_current);
connected_objects = s_conn_return_others (connected_objects, o_current);
}
}
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 637a302..5be1e04 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -359,12 +359,12 @@ void s_color_destroy_all(void);
/* s_conn.c */
CONN *s_conn_return_new(OBJECT *other_object, int type, int x, int y, int whichone, int other_whichone);
int s_conn_uniq(GList *conn_list, CONN *input_conn);
-int s_conn_remove_other(TOPLEVEL *toplevel, OBJECT *other_object, OBJECT *to_remove);
-void s_conn_remove(TOPLEVEL *toplevel, OBJECT *to_remove);
-void s_conn_remove_complex(TOPLEVEL *toplevel, OBJECT *to_remove);
+int s_conn_remove_other(OBJECT *other_object, OBJECT *to_remove);
+void s_conn_remove(OBJECT *to_remove);
+void s_conn_remove_complex(OBJECT *to_remove);
OBJECT *s_conn_check_midpoint(OBJECT *o_current, int x, int y);
-void s_conn_update_object(TOPLEVEL *toplevel, OBJECT *object);
-void s_conn_update_complex(TOPLEVEL *toplevel, GList *list);
+void s_conn_update_object(OBJECT *object);
+void s_conn_update_complex(GList *list);
void s_conn_print(GList *conn_list);
int s_conn_net_search(OBJECT* new_net, int whichone, GList * conn_list);
GList *s_conn_return_others(GList *input_list, OBJECT *object);
diff --git a/libgeda/src/o_bus_basic.c b/libgeda/src/o_bus_basic.c
index 82e0369..734a8f5 100644
--- a/libgeda/src/o_bus_basic.c
+++ b/libgeda/src/o_bus_basic.c
@@ -95,7 +95,7 @@ OBJECT *o_bus_new(TOPLEVEL *toplevel,
s_tile_add_line_object(toplevel, new_node);
if (!toplevel->ADDING_SEL) {
- s_conn_update_object(toplevel, new_node);
+ s_conn_update_object (new_node);
}
return new_node;
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index dddf3cd..a07f15c 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -549,7 +549,7 @@ OBJECT *o_complex_new(TOPLEVEL *toplevel,
o_glist_translate_world (toplevel, x, y, prim_objs);
if (!toplevel->ADDING_SEL) {
- s_conn_update_complex(toplevel, prim_objs);
+ s_conn_update_complex (prim_objs);
}
}
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index 0301704..79e9b86 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -89,7 +89,7 @@ OBJECT *o_net_new(TOPLEVEL *toplevel, char type,
if (!toplevel->ADDING_SEL) {
s_tile_add_line_object(toplevel, new_node);
- s_conn_update_object(toplevel, new_node);
+ s_conn_update_object (new_node);
}
return new_node;
@@ -585,12 +585,12 @@ int o_net_consolidate_segments(TOPLEVEL *toplevel, OBJECT *object)
o_selection_add( toplevel->page_current->selection_list, object );
}
- s_conn_remove(toplevel, other_object);
+ s_conn_remove (other_object);
s_page_remove (toplevel->page_current, other_object);
s_delete(toplevel, other_object);
o_net_recalc(toplevel, object);
s_tile_update_object(toplevel, object);
- s_conn_update_object(toplevel, object);
+ s_conn_update_object (object);
return(-1);
}
}
diff --git a/libgeda/src/o_pin_basic.c b/libgeda/src/o_pin_basic.c
index e9dfbb5..aec0077 100644
--- a/libgeda/src/o_pin_basic.c
+++ b/libgeda/src/o_pin_basic.c
@@ -94,7 +94,7 @@ OBJECT *o_pin_new(TOPLEVEL *toplevel,
if (!toplevel->ADDING_SEL) {
s_tile_add_line_object(toplevel, new_node);
- s_conn_update_object(toplevel, new_node);
+ s_conn_update_object (new_node);
}
return new_node;
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index f337f16..aaee572 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -226,7 +226,7 @@ void
s_delete_object(TOPLEVEL *toplevel, OBJECT *o_current)
{
if (o_current != NULL) {
- s_conn_remove(toplevel, o_current);
+ s_conn_remove (o_current);
if (o_current->attached_to != NULL) {
/* do the actual remove */
diff --git a/libgeda/src/s_conn.c b/libgeda/src/s_conn.c
index 18dd0ed..19d085b 100644
--- a/libgeda/src/s_conn.c
+++ b/libgeda/src/s_conn.c
@@ -110,13 +110,11 @@ int s_conn_uniq(GList * conn_list, CONN * input_conn)
* \par Function Description
* This function removes the OBJECT <b>to_remove</b> from the connection
* list of the OBJECT <b>other_object</b>.
- * \param toplevel (currently not used)
* \param other_object OBJECT from that the to_remove OBJECT needs to be removed
* \param to_remove OBJECT to remove
* \return TRUE if a connection has been deleted, FALSE otherwise
*/
-int s_conn_remove_other(TOPLEVEL * toplevel, OBJECT * other_object,
- OBJECT * to_remove)
+int s_conn_remove_other (OBJECT *other_object, OBJECT *to_remove)
{
GList *c_current = NULL;
CONN *conn = NULL;
@@ -162,10 +160,9 @@ int s_conn_remove_other(TOPLEVEL * toplevel, OBJECT * other_object,
* \par Function Description
* This function removes all connections from and to the OBJECT
* <b>to_remove</b>.
- * \param toplevel (currently not used)
* \param to_remove OBJECT to unconnected from all other objects
*/
-void s_conn_remove(TOPLEVEL * toplevel, OBJECT * to_remove)
+void s_conn_remove (OBJECT *to_remove)
{
GList *c_current;
CONN *conn;
@@ -185,8 +182,7 @@ void s_conn_remove(TOPLEVEL * toplevel, OBJECT * to_remove)
/* keep calling this till it returns false (all refs removed) */
/* there is NO body to this while loop */
- while (s_conn_remove_other
- (toplevel, conn->other_object, to_remove));
+ while (s_conn_remove_other (conn->other_object, to_remove));
#if DEBUG
printf("returned from remove_other\n");
@@ -218,11 +214,10 @@ void s_conn_remove(TOPLEVEL * toplevel, OBJECT * to_remove)
* This function removes all connections from and to the underlying
* OBJECTS of the given complex OBJECT
* <b>to_remove</b>.
- * \param toplevel (currently not used)
* \param to_remove OBJECT to unconnected from all other objects
*
*/
-void s_conn_remove_complex(TOPLEVEL * toplevel, OBJECT * to_remove)
+void s_conn_remove_complex (OBJECT *to_remove)
{
OBJECT *o_current;
GList *iter;
@@ -238,7 +233,7 @@ void s_conn_remove_complex(TOPLEVEL * toplevel, OBJECT * to_remove)
case (OBJ_NET):
case (OBJ_PIN):
case (OBJ_BUS):
- s_conn_remove(toplevel, o_current);
+ s_conn_remove (o_current);
break;
}
@@ -306,10 +301,9 @@ OBJECT *s_conn_check_midpoint(OBJECT *o_current, int x, int y)
* <b>object</b> to all other connectable objects. It adds connections
* to the object and from all other
* objects to this one.
- * \param toplevel (currently not used)
* \param object OBJECT to add into the connection system
*/
-void s_conn_update_object(TOPLEVEL * toplevel, OBJECT * object)
+void s_conn_update_object (OBJECT * object)
{
TILE *t_current;
GList *tl_current;
@@ -713,10 +707,9 @@ void s_conn_update_object(TOPLEVEL * toplevel, OBJECT * object)
* \par Function Description
* This function adds all underlying OBJECTs of a complex OBJECT
* <b>complex</b> into the connection system.
- * \param toplevel (currently not used)
* \param complex complex OBJECT to add into the connection system
*/
-void s_conn_update_complex (TOPLEVEL * toplevel, GList* list)
+void s_conn_update_complex (GList* list)
{
OBJECT *o_current;
GList *iter;
@@ -728,7 +721,7 @@ void s_conn_update_complex (TOPLEVEL * toplevel, GList* list)
case (OBJ_PIN):
case (OBJ_NET):
case (OBJ_BUS):
- s_conn_update_object(toplevel, o_current);
+ s_conn_update_object (o_current);
break;
}
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs