[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-56-g2e3c06c)
The branch, master has been updated
via 2e3c06cbcdce8254f70162ecebd650980cf70ee9 (commit)
via 8952ec9bd4f4985fae8aadd6c4103b933464152a (commit)
from f94d63a9a9f73e70b51c16b1e9f337bfa26b0de2 (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
=========
gattrib/src/gattrib.c | 5 +----
gattrib/src/i_vars.c | 18 ++----------------
gnetlist/include/globals.h | 3 ---
gnetlist/src/globals.c | 2 --
gschem/src/globals.c | 1 -
gsymcheck/src/globals.c | 2 --
libgeda/include/funcs.h | 5 -----
libgeda/src/s_toplevel.c | 6 ------
utils/gschlas/globals.c | 2 --
utils/include/globals.h | 3 ---
10 files changed, 3 insertions(+), 44 deletions(-)
=================
Commit Messages
=================
commit 2e3c06cbcdce8254f70162ecebd650980cf70ee9
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Sep 9 00:18:34 2007 +0100
Remove the globally exported variable_set_func.
Only gattrib provided a non-NULL export of this symbol, and such imports
into libgeda prevent libgeda being dynamically linked on some platforms.
To better match the other tools in the suite, gattrib's i_vars_set() and
i_window_vars_set() functions were combined into a single i_vars_set().
:100644 100644 5c5c178... 9fcccee... M gattrib/src/gattrib.c
:100644 100644 b10f532... 1bb1f18... M gattrib/src/i_vars.c
:100644 100644 21a2de9... 0f8782a... M gnetlist/src/globals.c
:100644 100644 9d263e1... ee1880a... M gschem/src/globals.c
:100644 100644 fa0018e... 7236d9e... M gsymcheck/src/globals.c
:100644 100644 bbdddb7... 11cbb2f... M libgeda/include/funcs.h
:100644 100644 716cee9... 04a49b4... M libgeda/src/s_toplevel.c
:100644 100644 1f9d7c2... 005a711... M utils/gschlas/globals.c
commit 8952ec9bd4f4985fae8aadd6c4103b933464152a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Sep 9 00:01:14 2007 +0100
Remove unused extern variables from libgeda, gnetlist and utils.
:100644 100644 5c05e8e... 2836ab6... M gnetlist/include/globals.h
:100644 100644 fead3b4... bbdddb7... M libgeda/include/funcs.h
:100644 100644 f6775f3... 98495d2... M utils/include/globals.h
=========
Changes
=========
commit 2e3c06cbcdce8254f70162ecebd650980cf70ee9
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Sep 9 00:18:34 2007 +0100
Remove the globally exported variable_set_func.
Only gattrib provided a non-NULL export of this symbol, and such imports
into libgeda prevent libgeda being dynamically linked on some platforms.
To better match the other tools in the suite, gattrib's i_vars_set() and
i_window_vars_set() functions were combined into a single i_vars_set().
diff --git a/gattrib/src/gattrib.c b/gattrib/src/gattrib.c
index 5c5c178..9fcccee 100644
--- a/gattrib/src/gattrib.c
+++ b/gattrib/src/gattrib.c
@@ -181,10 +181,7 @@ void gattrib_main(void *closure, int argc, char *argv[])
/* ----- Read in RC files. ----- */
g_rc_parse(pr_current, "gattribrc", NULL);
- i_window_vars_set(pr_current); /* The window vars are used in gschem,
- but we need to set them here because
- graphical information is used
- when introducing new attributes. */
+ i_vars_set(pr_current);
gtk_init(&argc, &argv);
diff --git a/gattrib/src/i_vars.c b/gattrib/src/i_vars.c
index b10f532..1bb1f18 100644
--- a/gattrib/src/i_vars.c
+++ b/gattrib/src/i_vars.c
@@ -52,27 +52,13 @@ int default_paper_height = 85000;
/*------------------------------------------------------------------
- * This initializes the vars in pr_current. It is copied from
- * gnetlist. It is called by the guile initializtion fcns.
- * It competes with i_window_vars_set. This is badly architected!!
+ * This initializes the vars in pr_current.
*------------------------------------------------------------------*/
void i_vars_set(TOPLEVEL * pr_current)
{
- i_vars_libgeda_set(pr_current);
-}
-
-
-/*------------------------------------------------------------------
- * This initializes the vars in pr_current. It is copied from
- * gschem. It is called from s_toplevel_init.
- *------------------------------------------------------------------*/
-void i_window_vars_set(TOPLEVEL * pr_current)
-{
-
- i_vars_libgeda_set(pr_current);
+ i_vars_libgeda_set(pr_current);
pr_current->attribute_color = default_attribute_color;
pr_current->paper_width = default_paper_width;
pr_current->paper_height = default_paper_height;
-
}
diff --git a/gnetlist/src/globals.c b/gnetlist/src/globals.c
index 21a2de9..0f8782a 100644
--- a/gnetlist/src/globals.c
+++ b/gnetlist/src/globals.c
@@ -58,8 +58,6 @@ void (*text_draw_func)() = o_text_recalc;
void (*pin_draw_func)() = o_pin_recalc;
void (*select_func)() = NULL;
void (*x_log_update_func)() = NULL;
-/* void (*variable_set_func)() = i_vars_set; */
-void (*variable_set_func)() = NULL;
int (*load_newer_backup_func)() = NULL;
/* netlist specific variables */
diff --git a/gschem/src/globals.c b/gschem/src/globals.c
index 9d263e1..ee1880a 100644
--- a/gschem/src/globals.c
+++ b/gschem/src/globals.c
@@ -67,7 +67,6 @@ void (*text_draw_func)() = o_text_draw;
void (*pin_draw_func)() = o_pin_draw;
void (*select_func)() = o_select_object; /* NEW SELECTION code */
void (*x_log_update_func)() = NULL;
-void (*variable_set_func)() = NULL; /* not used by gschem */
int (*load_newer_backup_func)() = x_fileselect_load_backup;
/* command line options */
diff --git a/gsymcheck/src/globals.c b/gsymcheck/src/globals.c
index fa0018e..7236d9e 100644
--- a/gsymcheck/src/globals.c
+++ b/gsymcheck/src/globals.c
@@ -56,8 +56,6 @@ void (*bus_draw_func)() = o_bus_recalc;
void (*pin_draw_func)() = o_pin_recalc;
void (*select_func)() = NULL;
void (*x_log_update_func)() = s_log_update;
-/* void (*variable_set_func)() = i_vars_set; */
-void (*variable_set_func)() = NULL;
int (*load_newer_backup_func)() = NULL;
/* command line arguments */
diff --git a/libgeda/include/funcs.h b/libgeda/include/funcs.h
index bbdddb7..11cbb2f 100644
--- a/libgeda/include/funcs.h
+++ b/libgeda/include/funcs.h
@@ -10,7 +10,6 @@ extern void (*text_draw_func)();
extern void (*pin_draw_func)();
extern void (*select_func)();
extern void (*x_log_update_func)();
-extern void (*variable_set_func)();
/* load_newer_backup_func is called if an autosave backup file is found
when loading a new schematic. It should ask the user what to do, and
return TRUE if the backup file should be loaded, or FALSE otherwise */
diff --git a/libgeda/src/s_toplevel.c b/libgeda/src/s_toplevel.c
index 716cee9..04a49b4 100644
--- a/libgeda/src/s_toplevel.c
+++ b/libgeda/src/s_toplevel.c
@@ -371,12 +371,6 @@ TOPLEVEL *s_toplevel_new (void)
toplevel->auto_save_interval = 0;
toplevel->auto_save_timeout = 0;
- /* set the rest of the variables */
- if (variable_set_func) {
- (*variable_set_func) (toplevel);
- }
-
-
/* disable the events */
toplevel->DONT_REDRAW = 1;
diff --git a/utils/gschlas/globals.c b/utils/gschlas/globals.c
index 1f9d7c2..005a711 100644
--- a/utils/gschlas/globals.c
+++ b/utils/gschlas/globals.c
@@ -60,8 +60,6 @@ void (*text_draw_func)() = o_text_recalc;
void (*pin_draw_func)() = o_pin_recalc;
void (*select_func)() = o_select_dummy;
void (*x_log_update_func)() = NULL;
-/* void (*variable_set_func)() = i_vars_set; */
-void (*variable_set_func)() = NULL;
int (*load_newer_backup_func)() = NULL;
/* this is just a dummy function, so that compoments are saved properly */
commit 8952ec9bd4f4985fae8aadd6c4103b933464152a
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Sep 9 00:01:14 2007 +0100
Remove unused extern variables from libgeda, gnetlist and utils.
diff --git a/gnetlist/include/globals.h b/gnetlist/include/globals.h
index 5c05e8e..2836ab6 100644
--- a/gnetlist/include/globals.h
+++ b/gnetlist/include/globals.h
@@ -45,9 +45,6 @@ extern int logfile_fd;
extern int do_logging;
extern int logging_dest;
-extern void (*pin_conn_recalc_func)();
-extern void (*net_conn_recalc_func)();
-
/* gnetlist specific stuff */
extern NETLIST *netlist_head;
extern NETLIST *graphical_netlist_head; /* Special objects with
diff --git a/libgeda/include/funcs.h b/libgeda/include/funcs.h
index fead3b4..bbdddb7 100644
--- a/libgeda/include/funcs.h
+++ b/libgeda/include/funcs.h
@@ -9,12 +9,8 @@ extern void (*bus_draw_func)();
extern void (*text_draw_func)();
extern void (*pin_draw_func)();
extern void (*select_func)();
-extern void (*pin_conn_recalc_func)();
-extern void (*net_conn_recalc_func)();
extern void (*x_log_update_func)();
extern void (*variable_set_func)();
-extern char * (*ps_color_string)();
-extern int (*image_color_int)();
/* load_newer_backup_func is called if an autosave backup file is found
when loading a new schematic. It should ask the user what to do, and
return TRUE if the backup file should be loaded, or FALSE otherwise */
diff --git a/utils/include/globals.h b/utils/include/globals.h
index f6775f3..98495d2 100644
--- a/utils/include/globals.h
+++ b/utils/include/globals.h
@@ -45,9 +45,6 @@ extern int logfile_fd;
extern int do_logging;
extern int logging_dest;
-extern void (*pin_conn_recalc_func)();
-extern void (*net_conn_recalc_func)();
-
/* gnetlist specific stuff */
extern NETLIST *netlist_head;
extern char *guile_proc;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs