gEDA-cvs: gaf.git: branch: master updated (1.6.1-20100214-94-g4a2bace)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  4a2baceb1bf4546f8888045f80fb989794d9130f (commit)
      from  4474d121a1c2c81f8c79b95a426e3e7245eb032d (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_pin.c |   15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)


=================
 Commit Messages
=================

commit 4a2baceb1bf4546f8888045f80fb989794d9130f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    gschem: Remove some redundant alias variables in o_pin_end()
    
    Whilst I'm here, remove a NULL test.. o_pin_new() doesn't return NULL.

:100644 100644 a5b7f80... 2229a5e... M	gschem/src/o_pin.c

=========
 Changes
=========

commit 4a2baceb1bf4546f8888045f80fb989794d9130f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    gschem: Remove some redundant alias variables in o_pin_end()
    
    Whilst I'm here, remove a NULL test.. o_pin_new() doesn't return NULL.

diff --git a/gschem/src/o_pin.c b/gschem/src/o_pin.c
index a5b7f80..2229a5e 100644
--- a/gschem/src/o_pin.c
+++ b/gschem/src/o_pin.c
@@ -121,7 +121,6 @@ void o_pin_end(GSCHEM_TOPLEVEL *w_current, int x, int y)
   OBJECT *new_obj;
   int color;
   GList *prev_conn_objects = NULL;
-  OBJECT *o_current, *o_current_pin;
 
   g_assert( w_current->inside_action != 0 );
 
@@ -147,20 +146,16 @@ void o_pin_end(GSCHEM_TOPLEVEL *w_current, int x, int y)
                       PIN_TYPE_NET, 0);
   s_page_append (toplevel, toplevel->page_current, new_obj);
 
-  o_current = o_current_pin = new_obj;
-
-  if (scm_hook_empty_p(add_pin_hook) == SCM_BOOL_F &&
-      o_current != NULL) {
-    scm_run_hook(add_pin_hook,
-		 scm_cons(g_make_object_smob(toplevel, o_current),
-			  SCM_EOL));
+  if (scm_hook_empty_p (add_pin_hook) == SCM_BOOL_F) {
+    scm_run_hook (add_pin_hook,
+                  scm_cons (g_make_object_smob (toplevel, new_obj), SCM_EOL));
   }
 
   /* look for connected objects */
-  prev_conn_objects = s_conn_return_others(prev_conn_objects, o_current_pin);
+  prev_conn_objects = s_conn_return_others (prev_conn_objects, new_obj);
   o_invalidate_glist (w_current, prev_conn_objects);
   g_list_free (prev_conn_objects);
-  o_invalidate (w_current, o_current_pin);
+  o_invalidate (w_current, new_obj);
 
   toplevel->page_current->CHANGED=1;
   o_undo_savestate(w_current, UNDO_ALL);




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs