[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-79-g17c64b7)
The branch, master has been updated
via 17c64b764cb42afc8d5b80a66361029655dd644b (commit)
via ff25b0c07dcd59e23721cbf9d09ec2a9f41a935a (commit)
via 235d219c4c9b96409cd4b95be3960e7e9f2689eb (commit)
from 123f5742e323b35169479f0884a66b75104a53ff (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/globals.h | 5 +++++
gschem/src/o_misc.c | 2 +-
gschem/src/o_undo.c | 5 ++---
libgeda/include/prototype.h | 2 +-
libgeda/src/o_arc_basic.c | 3 +--
libgeda/src/o_box_basic.c | 3 +--
libgeda/src/o_bus_basic.c | 3 +--
libgeda/src/o_circle_basic.c | 3 +--
libgeda/src/o_complex_basic.c | 8 +++-----
libgeda/src/o_line_basic.c | 3 +--
libgeda/src/o_net_basic.c | 3 +--
libgeda/src/o_picture.c | 6 ++----
libgeda/src/o_pin_basic.c | 3 +--
libgeda/src/o_text_basic.c | 5 ++---
libgeda/src/s_basic.c | 4 ++--
libgeda/src/s_page.c | 3 +--
16 files changed, 26 insertions(+), 35 deletions(-)
=================
Commit Messages
=================
commit 17c64b764cb42afc8d5b80a66361029655dd644b
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Tue Aug 12 23:36:35 2008 +0100
s_basic_init_object(): Set OBJECT type according to new parameter.
:100644 100644 80a70a6... 864ee0a... M gschem/src/o_misc.c
:100644 100644 f262562... bcd396b... M gschem/src/o_undo.c
:100644 100644 052c18d... ce0e194... M libgeda/include/prototype.h
:100644 100644 455ec54... 7bfce1a... M libgeda/src/o_arc_basic.c
:100644 100644 5f13c67... 54e40eb... M libgeda/src/o_box_basic.c
:100644 100644 9a4d8e6... 32ccd6e... M libgeda/src/o_bus_basic.c
:100644 100644 fc7e49a... 4f0acb5... M libgeda/src/o_circle_basic.c
:100644 100644 716ad64... b42c636... M libgeda/src/o_complex_basic.c
:100644 100644 625206a... 5554de2... M libgeda/src/o_line_basic.c
:100644 100644 1538a0b... 465cd61... M libgeda/src/o_net_basic.c
:100644 100644 e86649a... 1a7810e... M libgeda/src/o_picture.c
:100644 100644 e58e1f7... f65cfdc... M libgeda/src/o_pin_basic.c
:100644 100644 8c1dc92... cf5aad6... M libgeda/src/o_text_basic.c
:100644 100644 5a92e7e... 3463c80... M libgeda/src/s_basic.c
:100644 100644 da2bf22... e16648c... M libgeda/src/s_page.c
commit ff25b0c07dcd59e23721cbf9d09ec2a9f41a935a
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Tue Aug 12 23:36:35 2008 +0100
s_basic_init_object(): Constify argument.
:100644 100644 12f3f64... 052c18d... M libgeda/include/prototype.h
:100644 100644 a58723a... 5a92e7e... M libgeda/src/s_basic.c
commit 235d219c4c9b96409cd4b95be3960e7e9f2689eb
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Tue Aug 12 23:36:35 2008 +0100
Add header guard.
:100644 100644 acd4ed8... 42817c6... M gschem/include/globals.h
=========
Changes
=========
commit 17c64b764cb42afc8d5b80a66361029655dd644b
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Tue Aug 12 23:36:35 2008 +0100
s_basic_init_object(): Set OBJECT type according to new parameter.
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index 80a70a6..864ee0a 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -768,7 +768,7 @@ void o_update_component(GSCHEM_TOPLEVEL *w_current, OBJECT *o_current)
o_selection_remove( toplevel->page_current->selection_list, o_current);
/* build a temporary list and add a complex to this list */
- tmp_list = s_basic_init_object ("update component");
+ tmp_list = s_basic_init_object(OBJ_HEAD, "update component");
new_complex = o_complex_add (toplevel,
tmp_list, NULL,
OBJ_COMPLEX,
diff --git a/gschem/src/o_undo.c b/gschem/src/o_undo.c
index f262562..bcd396b 100644
--- a/gschem/src/o_undo.c
+++ b/gschem/src/o_undo.c
@@ -123,7 +123,7 @@ void o_undo_savestate(GSCHEM_TOPLEVEL *w_current, int flag)
toplevel->page_current->ops_since_last_backup++;
}
- object_head = s_basic_init_object("undo_head");
+ object_head = s_basic_init_object(OBJ_HEAD, "undo_head");
o_list_copy_all(toplevel,
toplevel->page_current->object_head->next,
@@ -383,8 +383,7 @@ void o_undo_callback(GSCHEM_TOPLEVEL *w_current, int type)
s_delete_list_fromstart(toplevel, toplevel->page_current->object_head);
- toplevel->page_current->object_head = s_basic_init_object("object_head");
- toplevel->page_current->object_head->type = OBJ_HEAD;
+ toplevel->page_current->object_head = s_basic_init_object(OBJ_HEAD, "object_head");
o_list_copy_all(toplevel, u_current->object_head->next,
toplevel->page_current->object_head,
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 052c18d..ce0e194 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -330,7 +330,7 @@ void error_if_called(void);
void exit_if_null(void *ptr);
OBJECT *return_tail(OBJECT *head);
OBJECT *return_head(OBJECT *tail);
-OBJECT *s_basic_init_object(char const *name);
+OBJECT *s_basic_init_object(int type, char const *name);
OBJECT *s_basic_link_object(OBJECT *new_node, OBJECT *ptr);
void print_struct_forw(OBJECT *ptr);
void print_struct_back(OBJECT *ptr);
diff --git a/libgeda/src/o_arc_basic.c b/libgeda/src/o_arc_basic.c
index 455ec54..7bfce1a 100644
--- a/libgeda/src/o_arc_basic.c
+++ b/libgeda/src/o_arc_basic.c
@@ -66,8 +66,7 @@ OBJECT *o_arc_add(TOPLEVEL *toplevel, OBJECT *object_list,
OBJECT *new_node;
- new_node = s_basic_init_object("arc");
- new_node->type = type;
+ new_node = s_basic_init_object(type, "arc");
new_node->color = color;
new_node->arc = (ARC *) g_malloc(sizeof(ARC));
diff --git a/libgeda/src/o_box_basic.c b/libgeda/src/o_box_basic.c
index 5f13c67..54e40eb 100644
--- a/libgeda/src/o_box_basic.c
+++ b/libgeda/src/o_box_basic.c
@@ -87,8 +87,7 @@ OBJECT *o_box_add(TOPLEVEL *toplevel, OBJECT *object_list,
BOX *box;
/* create the object */
- new_node = s_basic_init_object("box");
- new_node->type = type;
+ new_node = s_basic_init_object(type, "box");
new_node->color = color;
box = (BOX *) g_malloc(sizeof(BOX));
diff --git a/libgeda/src/o_bus_basic.c b/libgeda/src/o_bus_basic.c
index 9a4d8e6..32ccd6e 100644
--- a/libgeda/src/o_bus_basic.c
+++ b/libgeda/src/o_bus_basic.c
@@ -53,8 +53,7 @@ OBJECT *o_bus_add(TOPLEVEL *toplevel, OBJECT *object_list,
int left, right, top, bottom;
OBJECT *new_node;
- new_node = s_basic_init_object("bus");
- new_node->type = type;
+ new_node = s_basic_init_object(type, "bus");
new_node->color = color;
new_node->line = (LINE *) g_malloc(sizeof(LINE));
diff --git a/libgeda/src/o_circle_basic.c b/libgeda/src/o_circle_basic.c
index fc7e49a..4f0acb5 100644
--- a/libgeda/src/o_circle_basic.c
+++ b/libgeda/src/o_circle_basic.c
@@ -72,8 +72,7 @@ OBJECT *o_circle_add(TOPLEVEL *toplevel, OBJECT *object_list,
OBJECT *new_node;
/* create the object */
- new_node = s_basic_init_object("circle");
- new_node->type = type;
+ new_node = s_basic_init_object(type, "circle");
new_node->color = color;
new_node->circle = (CIRCLE *) g_malloc(sizeof(CIRCLE));
diff --git a/libgeda/src/o_complex_basic.c b/libgeda/src/o_complex_basic.c
index 716ad64..b42c636 100644
--- a/libgeda/src/o_complex_basic.c
+++ b/libgeda/src/o_complex_basic.c
@@ -212,9 +212,7 @@ OBJECT *add_head(void)
{
OBJECT *new_node=NULL;
- new_node = s_basic_init_object("complex_head");
-
- new_node->type = OBJ_HEAD; /* make this of head type hack */
+ new_node = s_basic_init_object(OBJ_HEAD, "complex_head");
/* don't need to do this for head nodes */
/* ret = (OBJECT *) s_basic_link_object(new_node, NULL);*/
@@ -333,7 +331,7 @@ OBJECT *o_complex_add(TOPLEVEL *toplevel, OBJECT *object_list,
use_object_list = FALSE;
}
- new_node = s_basic_init_object("complex");
+ new_node = s_basic_init_object(type, "complex");
new_node->type = type;
if (clib != NULL) {
@@ -618,7 +616,7 @@ OBJECT *o_complex_add_embedded(TOPLEVEL *toplevel, OBJECT *object_list,
OBJECT *prim_objs=NULL;
OBJECT *new_node=NULL;
- new_node = s_basic_init_object("complex");
+ new_node = s_basic_init_object(type, "complex");
new_node->type = type;
new_node->complex = (COMPLEX *) g_malloc(sizeof(COMPLEX));
diff --git a/libgeda/src/o_line_basic.c b/libgeda/src/o_line_basic.c
index 625206a..5554de2 100644
--- a/libgeda/src/o_line_basic.c
+++ b/libgeda/src/o_line_basic.c
@@ -69,8 +69,7 @@ OBJECT *o_line_add(TOPLEVEL *toplevel, OBJECT *object_list,
OBJECT *new_node;
/* create the object */
- new_node = s_basic_init_object("line");
- new_node->type = type;
+ new_node = s_basic_init_object(type, "line");
new_node->color = color;
new_node->line = (LINE *) g_malloc(sizeof(LINE));
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index 1538a0b..465cd61 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -65,8 +65,7 @@ OBJECT *o_net_add(TOPLEVEL *toplevel, OBJECT *object_list, char type,
int left, right, top, bottom;
OBJECT *new_node;
- new_node = s_basic_init_object("net");
- new_node->type = type;
+ new_node = s_basic_init_object(type, "net");
new_node->color = color;
new_node->line = (LINE *) g_malloc(sizeof(LINE));
diff --git a/libgeda/src/o_picture.c b/libgeda/src/o_picture.c
index e86649a..1a7810e 100644
--- a/libgeda/src/o_picture.c
+++ b/libgeda/src/o_picture.c
@@ -344,8 +344,7 @@ OBJECT *o_picture_add(TOPLEVEL *toplevel, OBJECT *list_tail, GdkPixbuf *pixbuf,
PICTURE *picture;
/* create the object */
- new_node = s_basic_init_object("picture");
- new_node->type = type;
+ new_node = s_basic_init_object(type, "picture");
picture = (PICTURE *) g_malloc(sizeof(PICTURE));
new_node->picture = picture;
@@ -683,8 +682,7 @@ OBJECT *o_picture_copy(TOPLEVEL *toplevel, OBJECT *list_tail,
PICTURE *picture;
/* create the object */
- new_node = s_basic_init_object("picture");
- new_node->type = object->type;
+ new_node = s_basic_init_object(object->type, "picture");
picture = g_malloc(sizeof(PICTURE));
new_node->picture = picture;
diff --git a/libgeda/src/o_pin_basic.c b/libgeda/src/o_pin_basic.c
index e58e1f7..f65cfdc 100644
--- a/libgeda/src/o_pin_basic.c
+++ b/libgeda/src/o_pin_basic.c
@@ -51,8 +51,7 @@ OBJECT *o_pin_add(TOPLEVEL *toplevel, OBJECT *object_list,
int left, right, top, bottom;
OBJECT *new_node;
- new_node = s_basic_init_object("pin");
- new_node->type = type;
+ new_node = s_basic_init_object(type, "pin");
new_node->color = color;
new_node->line = (LINE *) g_malloc(sizeof(LINE));
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index 8c1dc92..cf5aad6 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -72,8 +72,7 @@ OBJECT *o_text_add_head(void)
{
OBJECT *new_node=NULL;
- new_node = s_basic_init_object("text_head");
- new_node->type = OBJ_HEAD;
+ new_node = s_basic_init_object(OBJ_HEAD, "text_head");
/* don't need to do this for head nodes */
/* ret = s_basic_link_object(new_node, NULL);*/
@@ -899,7 +898,7 @@ OBJECT *o_text_add(TOPLEVEL *toplevel, OBJECT *object_list,
return(NULL);
}
- new_node = s_basic_init_object("text");
+ new_node = s_basic_init_object(type, "text");
new_node->type = type;
text = (TEXT *) g_malloc(sizeof(TEXT));
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index 5a92e7e..3463c80 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -109,7 +109,7 @@ OBJECT *return_head(OBJECT *tail)
* \par Function Description
*
*/
-OBJECT *s_basic_init_object(char const *name)
+OBJECT *s_basic_init_object(int type, char const *name)
{
OBJECT *new_node;
@@ -117,7 +117,7 @@ OBJECT *s_basic_init_object(char const *name)
/* setup sid */
new_node->sid = global_sid++;
- new_node->type = -1;
+ new_node->type = type;
/* Setup the name */
new_node->name = g_strdup_printf("%s.%d", name, new_node->sid);
diff --git a/libgeda/src/s_page.c b/libgeda/src/s_page.c
index da2bf22..e16648c 100644
--- a/libgeda/src/s_page.c
+++ b/libgeda/src/s_page.c
@@ -82,8 +82,7 @@ PAGE *s_page_new (TOPLEVEL *toplevel, const gchar *filename)
s_tile_init (toplevel, page);
/* First one to setup head */
- page->object_head = s_basic_init_object("object_head");
- page->object_head->type = OBJ_HEAD;
+ page->object_head = s_basic_init_object(OBJ_HEAD, "object_head");
/* new selection mechanism */
page->selection_list = o_selection_new();
commit ff25b0c07dcd59e23721cbf9d09ec2a9f41a935a
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Tue Aug 12 23:36:35 2008 +0100
s_basic_init_object(): Constify argument.
diff --git a/libgeda/include/prototype.h b/libgeda/include/prototype.h
index 12f3f64..052c18d 100644
--- a/libgeda/include/prototype.h
+++ b/libgeda/include/prototype.h
@@ -330,7 +330,7 @@ void error_if_called(void);
void exit_if_null(void *ptr);
OBJECT *return_tail(OBJECT *head);
OBJECT *return_head(OBJECT *tail);
-OBJECT *s_basic_init_object(char *name);
+OBJECT *s_basic_init_object(char const *name);
OBJECT *s_basic_link_object(OBJECT *new_node, OBJECT *ptr);
void print_struct_forw(OBJECT *ptr);
void print_struct_back(OBJECT *ptr);
diff --git a/libgeda/src/s_basic.c b/libgeda/src/s_basic.c
index a58723a..5a92e7e 100644
--- a/libgeda/src/s_basic.c
+++ b/libgeda/src/s_basic.c
@@ -109,7 +109,7 @@ OBJECT *return_head(OBJECT *tail)
* \par Function Description
*
*/
-OBJECT *s_basic_init_object( char *name )
+OBJECT *s_basic_init_object(char const *name)
{
OBJECT *new_node;
commit 235d219c4c9b96409cd4b95be3960e7e9f2689eb
Author: Bernd Jendrissek <bernd.jendrissek@xxxxxxxxx>
Date: Tue Aug 12 23:36:35 2008 +0100
Add header guard.
diff --git a/gschem/include/globals.h b/gschem/include/globals.h
index acd4ed8..42817c6 100644
--- a/gschem/include/globals.h
+++ b/gschem/include/globals.h
@@ -18,6 +18,9 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
*/
+#ifndef H_GSCHEM_GLOBALS_H
+#define H_GSCHEM_GLOBALS_H
+
/* used by various guile functions, set in x_event* functions */
extern GSCHEM_TOPLEVEL *global_window_current;
@@ -96,3 +99,5 @@ extern SCM new_page_hook;
/*EK* used by prototype.h */
#include "../include/x_states.h"
+
+#endif
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs