[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-172-g806065a)
The branch, master has been updated
via 806065ae428b105340fc6380918514bfe9746d86 (commit)
via 9993a0c13cc1b1aa5bb0c61a7355e89cd8f37fca (commit)
via 52fe25b3614b70a3ab059ecd1f980ddde447d108 (commit)
from 0090ef6ff6e9adfc8ab48d7d7aa110dbab1bed79 (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/include/prototype.h | 2 +-
gschem/src/g_hook.c | 7 +----
gschem/src/x_multiattrib.c | 4 +--
libgeda/include/prototype.h | 4 +--
libgeda/src/o_attrib.c | 10 ++------
libgeda/src/o_list.c | 47 -------------------------------------------
6 files changed, 8 insertions(+), 66 deletions(-)
=================
Commit Messages
=================
commit 806065ae428b105340fc6380918514bfe9746d86
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 17 19:34:14 2008 +0100
libgeda: Remove unused function o_list_search()
:100644 100644 b667394... 12c9130... M libgeda/include/prototype.h
:100644 100644 42c69b8... 15d5e11... M libgeda/src/o_list.c
commit 9993a0c13cc1b1aa5bb0c61a7355e89cd8f37fca
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 17 19:33:03 2008 +0100
Remove un-necessary use of o_list_search()
g_make_attrib_smob_list() and o_attrib_return_attribs() are passed the
object they are operating on directly. There is no need to prove it can
be found in the object list as well.
:100644 100644 91e4fc9... 7fe2103... M gschem/include/prototype.h
:100644 100644 aaca3f0... b724230... M gschem/src/g_hook.c
:100644 100644 7050619... 306d2a9... M gschem/src/x_multiattrib.c
:100644 100644 ee4524a... b667394... M libgeda/include/prototype.h
:100644 100644 cda88f5... b67a770... M libgeda/src/o_attrib.c
commit 52fe25b3614b70a3ab059ecd1f980ddde447d108
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 17 19:32:53 2008 +0100
libgeda: Remove unused function o_list_delete()
:100644 100644 ccddae5... ee4524a... M libgeda/include/prototype.h
:100644 100644 74e60dd... 42c69b8... M libgeda/src/o_list.c
=========
Changes
=========
commit 806065ae428b105340fc6380918514bfe9746d86
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 17 19:34:14 2008 +0100
libgeda: Remove unused function o_list_search()
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index b667394..12c9130 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -223,7 +223,6 @@ OBJECT *o_list_copy_to(TOPLEVEL *toplevel, OBJECT *list_head, OBJECT *selected,
OBJECT *o_list_copy_all(TOPLEVEL *toplevel, OBJECT *src_list_head, OBJECT *dest_list_head, int flag);
GList *o_glist_copy_all_to_glist(TOPLEVEL *toplevel, GList *src_list, GList *dest_list, int flag);
void o_glist_relink_objects (GList *o_glist);
-OBJECT *o_list_search(OBJECT *list, OBJECT *current);
void o_list_delete_rest(TOPLEVEL *toplevel, OBJECT *list);
void o_list_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *list);
void o_glist_translate_world(TOPLEVEL *toplevel, int dx, int dy, GList *list);
diff --git a/libgeda/src/o_list.c b/libgeda/src/o_list.c
index 42c69b8..15d5e11 100644
--- a/libgeda/src/o_list.c
+++ b/libgeda/src/o_list.c
@@ -350,34 +350,6 @@ void o_glist_relink_objects (GList *o_glist)
/*! \todo Finish function description!!!
* \brief
* \par Function Description
- * returns entry in the list
- *
- * \param [in] list
- * \param [in] current
- * \return OBJECT pointer.
- */
-OBJECT *o_list_search(OBJECT *list, OBJECT *current)
-{
- OBJECT *o_current;
-
- o_current = list ;
-
- g_return_val_if_fail (current != NULL, NULL);
- g_return_val_if_fail (list != NULL, NULL);
-
- while(o_current != NULL) {
- /* look for uniq sid */
- if (current->sid == o_current->sid) {
- return(o_current);
- }
- o_current = o_current->next;
- }
- return(NULL);
-}
-
-/*! \todo Finish function description!!!
- * \brief
- * \par Function Description
* assuming list is head
* head will NOT be deleted
*
commit 9993a0c13cc1b1aa5bb0c61a7355e89cd8f37fca
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 17 19:33:03 2008 +0100
Remove un-necessary use of o_list_search()
g_make_attrib_smob_list() and o_attrib_return_attribs() are passed the
object they are operating on directly. There is no need to prove it can
be found in the object list as well.
diff --git a/gschem/include/prototype.h b/gschem/include/prototype.h
index 91e4fc9..7fe2103 100644
--- a/gschem/include/prototype.h
+++ b/gschem/include/prototype.h
@@ -30,7 +30,7 @@ SCM g_funcs_use_rc_values(void);
SCM get_selected_component_attributes(GSCHEM_TOPLEVEL *w_current);
SCM get_selected_filename(GSCHEM_TOPLEVEL *w_current);
/* g_hook.c */
-SCM g_make_attrib_smob_list(GSCHEM_TOPLEVEL *w_current, OBJECT *curr_object);
+SCM g_make_attrib_smob_list(GSCHEM_TOPLEVEL *w_current, OBJECT *object);
SCM g_set_attrib_value_x(SCM attrib_smob, SCM scm_value);
SCM g_add_attrib(SCM object, SCM attrib_name,
SCM attrib_value, SCM scm_vis, SCM scm_show);
diff --git a/gschem/src/g_hook.c b/gschem/src/g_hook.c
index aaca3f0..b724230 100644
--- a/gschem/src/g_hook.c
+++ b/gschem/src/g_hook.c
@@ -50,17 +50,14 @@ static void custom_world_get_object_list_bounds
* \par Function Description
*
*/
-/* Makes a list of all attributes currently connected to curr_object. *
+/* Makes a list of all attributes currently connected to object. *
* Principle stolen from o_attrib_return_attribs */
-SCM g_make_attrib_smob_list(GSCHEM_TOPLEVEL *w_current, OBJECT *curr_object)
+SCM g_make_attrib_smob_list(GSCHEM_TOPLEVEL *w_current, OBJECT *object)
{
OBJECT *a_current;
- OBJECT *object;
GList *a_iter;
SCM smob_list = SCM_EOL;
- object = (OBJECT *) o_list_search(curr_object, curr_object);
-
if (!object) {
return(SCM_EOL);
}
diff --git a/gschem/src/x_multiattrib.c b/gschem/src/x_multiattrib.c
index 7050619..306d2a9 100644
--- a/gschem/src/x_multiattrib.c
+++ b/gschem/src/x_multiattrib.c
@@ -1919,9 +1919,7 @@ void multiattrib_update (Multiattrib *multiattrib)
return;
/* get list of attributes */
- object_attribs = o_attrib_return_attribs (
- GSCHEM_DIALOG (multiattrib)->w_current->toplevel->page_current->object_head,
- multiattrib->object);
+ object_attribs = o_attrib_return_attribs (multiattrib->object);
/* populate the store with attributes */
if (object_attribs) {
for (i = 0, o_current = object_attribs[i];
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index ee4524a..b667394 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -125,7 +125,7 @@ char *o_attrib_search_component(OBJECT *object, char *name);
void o_attrib_slot_update(TOPLEVEL *toplevel, OBJECT *object);
void o_attrib_slot_copy(TOPLEVEL *toplevel, OBJECT *original, OBJECT *target);
char *o_attrib_search_toplevel_all(GedaPageList *page_list, char *name);
-OBJECT **o_attrib_return_attribs(OBJECT *object_list, OBJECT *sel_object);
+OBJECT **o_attrib_return_attribs(OBJECT *sel_object);
void o_attrib_free_returned(OBJECT **found_objects);
/* o_basic.c */
diff --git a/libgeda/src/o_attrib.c b/libgeda/src/o_attrib.c
index cda88f5..b67a770 100644
--- a/libgeda/src/o_attrib.c
+++ b/libgeda/src/o_attrib.c
@@ -1707,21 +1707,17 @@ char *o_attrib_search_toplevel_all(GedaPageList *page_list, char *name)
* This function will only look for attached attributes and not
* unattached free floating attribs.
*
- * \param [in] object_list OBJECT list to search.
- * \param [in] sel_object OBJECT to search for.
- * \return An array of objects that matched sel_object, NULL otherwise.
+ * \param [in] object OBJECT whos attributes to return.
+ * \return An array of objects that attached to object, NULL otherwise.
*/
-OBJECT ** o_attrib_return_attribs(OBJECT *object_list, OBJECT *sel_object)
+OBJECT ** o_attrib_return_attribs(OBJECT *object)
{
OBJECT **found_objects;
int num_attribs=0;
int i=0;
OBJECT *a_current;
- OBJECT *object;
GList *a_iter;
- object = (OBJECT *) o_list_search(object_list, sel_object);
-
if (!object || !object->attribs) {
return(NULL);
}
commit 52fe25b3614b70a3ab059ecd1f980ddde447d108
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Wed Sep 17 19:32:53 2008 +0100
libgeda: Remove unused function o_list_delete()
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index ccddae5..ee4524a 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -224,7 +224,6 @@ OBJECT *o_list_copy_all(TOPLEVEL *toplevel, OBJECT *src_list_head, OBJECT *dest_
GList *o_glist_copy_all_to_glist(TOPLEVEL *toplevel, GList *src_list, GList *dest_list, int flag);
void o_glist_relink_objects (GList *o_glist);
OBJECT *o_list_search(OBJECT *list, OBJECT *current);
-void o_list_delete(TOPLEVEL *toplevel, OBJECT *list, OBJECT *delete);
void o_list_delete_rest(TOPLEVEL *toplevel, OBJECT *list);
void o_list_translate_world(TOPLEVEL *toplevel, int dx, int dy, OBJECT *list);
void o_glist_translate_world(TOPLEVEL *toplevel, int dx, int dy, GList *list);
diff --git a/libgeda/src/o_list.c b/libgeda/src/o_list.c
index 74e60dd..42c69b8 100644
--- a/libgeda/src/o_list.c
+++ b/libgeda/src/o_list.c
@@ -378,25 +378,6 @@ OBJECT *o_list_search(OBJECT *list, OBJECT *current)
/*! \todo Finish function description!!!
* \brief
* \par Function Description
- *
- * \param [in] toplevel The TOPLEVEL object.
- * \param [in] list
- * \param [in] delete
- */
-void o_list_delete(TOPLEVEL *toplevel, OBJECT *list, OBJECT *delete)
-{
- OBJECT *find;
-
- find = o_list_search(list, delete);
-
- if (find != NULL)
- s_delete(toplevel, find);
-
-}
-
-/*! \todo Finish function description!!!
- * \brief
- * \par Function Description
* assuming list is head
* head will NOT be deleted
*
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs