[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.7.1-20110619-203-gad40d32)
The branch, master has been updated
via ad40d32d555fc905103d2a15daaf1cdd95a19ccc (commit)
via 0e6193a0aa8b8105ef7494a5fac80d3929cf1c4d (commit)
via ebaead86930b822fcb2629ab24c67a305bd73988 (commit)
via fbb3b8c871116fe5e0b29140d92b15ecc9a6f8e1 (commit)
via decfce058604a9d8a595b7917234d8a0b0e715c2 (commit)
via dc65cd116b28138f28c7823c908740d8129042d6 (commit)
from 61c6201ef1b07f3f9d8c76fb2ffa725c142bdf2a (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
=========
configure.ac | 3 +--
gattrib/src/s_object.c | 25 ++++++++++---------------
gnetlist/src/s_hierarchy.c | 3 ---
gnetlist/src/s_net.c | 16 ----------------
gnetlist/src/s_netlist.c | 2 --
gschem/src/m_basic.c | 3 +--
gschem/src/x_event.c | 3 ---
gschem/src/x_multiattrib.c | 18 +++++++-----------
libgeda/src/o_arc_basic.c | 12 +++---------
libgeda/src/o_bus_basic.c | 8 +-------
libgeda/src/o_net_basic.c | 8 +-------
libgeda/src/o_path_basic.c | 3 ---
libgeda/src/o_text_basic.c | 5 ++---
libgeda/src/s_slib.c | 5 -----
utils/src/gmk_sym.c | 3 ---
15 files changed, 26 insertions(+), 91 deletions(-)
=================
Commit Messages
=================
commit ad40d32d555fc905103d2a15daaf1cdd95a19ccc
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Remove out-of-date FIXME comment.
:100644 100644 765abb2... c98281f... M configure.ac
commit 0e6193a0aa8b8105ef7494a5fac80d3929cf1c4d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
utils: Fix some "set but not used" warnings.
:100644 100644 c630c7d... 8258609... M utils/src/gmk_sym.c
commit ebaead86930b822fcb2629ab24c67a305bd73988
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gattrib: Fix some "set but not used" warnings.
:100644 100644 cb9d9a9... 8f25a03... M gattrib/src/s_object.c
commit fbb3b8c871116fe5e0b29140d92b15ecc9a6f8e1
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Fix some "set but not used" warnings.
:100644 100644 7caedd2... 67bd66f... M gnetlist/src/s_hierarchy.c
:100644 100644 91378ec... 0654d69... M gnetlist/src/s_net.c
:100644 100644 ba2c98f... c4bf1d9... M gnetlist/src/s_netlist.c
commit decfce058604a9d8a595b7917234d8a0b0e715c2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Fix some "set but not used" warnings.
:100644 100644 2219db4... e5e3ce5... M gschem/src/m_basic.c
:100644 100644 58dfe28... 829d531... M gschem/src/x_event.c
:100644 100644 e00cde9... ee2a5f9... M gschem/src/x_multiattrib.c
commit dc65cd116b28138f28c7823c908740d8129042d6
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Fix some "set but not used" warnings.
:100644 100644 39b0e8f... 52dadaf... M libgeda/src/o_arc_basic.c
:100644 100644 ae22db7... ac1841e... M libgeda/src/o_bus_basic.c
:100644 100644 443cb4c... 3fa642f... M libgeda/src/o_net_basic.c
:100644 100644 e5b907b... b5c34d5... M libgeda/src/o_path_basic.c
:100644 100644 a46137c... 2b7afe0... M libgeda/src/o_text_basic.c
:100644 100644 5db771e... d38e0d5... M libgeda/src/s_slib.c
=========
Changes
=========
commit ad40d32d555fc905103d2a15daaf1cdd95a19ccc
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
build-sys: Remove out-of-date FIXME comment.
diff --git a/configure.ac b/configure.ac
index 765abb2..c98281f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,8 +112,7 @@ AC_CHECK_HEADERS([errno.h fcntl.h])
# to be able to build gschem/src/gschem.c
AC_CHECK_HEADERS([locale.h])
-# Check for rint in math library. FIXME do we actually need to test
-# this? Should we use lrint instead?
+# Check for lrint in math library.
AC_CHECK_LIB([m], [lrint],
AC_DEFINE([HAVE_LRINT], 1,
[If your math library has lrint in it, define this]))
commit 0e6193a0aa8b8105ef7494a5fac80d3929cf1c4d
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
utils: Fix some "set but not used" warnings.
diff --git a/utils/src/gmk_sym.c b/utils/src/gmk_sym.c
index c630c7d..8258609 100644
--- a/utils/src/gmk_sym.c
+++ b/utils/src/gmk_sym.c
@@ -272,10 +272,7 @@ void cross(int pos_x,int pos_y,int color)
void pin_add(int pos_x,int pos_y,char *pin,int shape,int dir,char *name, char *type)
{ int x,y;
int xdir=0,ydir=0,font_size=8;
- int shape_offset=0;
- if (shape == DOT_SHAPE)
- shape_offset = 75;
switch (dir)
{
case L_SIDE: xdir = 1; ydir = 0;
commit ebaead86930b822fcb2629ab24c67a305bd73988
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gattrib: Fix some "set but not used" warnings.
diff --git a/gattrib/src/s_object.c b/gattrib/src/s_object.c
index cb9d9a9..8f25a03 100644
--- a/gattrib/src/s_object.c
+++ b/gattrib/src/s_object.c
@@ -86,18 +86,16 @@ s_object_add_comp_attrib_to_object (TOPLEVEL *toplevel,
gint show_name_value)
{
char *name_value_pair;
- OBJECT *attrib_graphic_object;
/* One last sanity check, then add attrib */
if (strlen(new_attrib_value) != 0) {
name_value_pair = g_strconcat(new_attrib_name, "=", new_attrib_value, NULL);
- attrib_graphic_object =
- s_object_attrib_add_attrib_in_object (toplevel,
- name_value_pair,
- visibility,
- show_name_value,
- o_current);
+ s_object_attrib_add_attrib_in_object (toplevel,
+ name_value_pair,
+ visibility,
+ show_name_value,
+ o_current);
}
return;
@@ -144,18 +142,15 @@ s_object_add_pin_attrib_to_object (TOPLEVEL *toplevel,
char *new_attrib_value)
{
char *name_value_pair;
- OBJECT *attrib_graphic_object;
-
/* One last sanity check */
if (strlen(new_attrib_value) != 0) {
name_value_pair = g_strconcat(new_attrib_name, "=", new_attrib_value, NULL);
- attrib_graphic_object =
- s_object_attrib_add_attrib_in_object (toplevel,
- name_value_pair,
- INVISIBLE,
- SHOW_NAME_VALUE,
- o_current);
+ s_object_attrib_add_attrib_in_object (toplevel,
+ name_value_pair,
+ INVISIBLE,
+ SHOW_NAME_VALUE,
+ o_current);
}
return;
commit fbb3b8c871116fe5e0b29140d92b15ecc9a6f8e1
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gnetlist: Fix some "set but not used" warnings.
diff --git a/gnetlist/src/s_hierarchy.c b/gnetlist/src/s_hierarchy.c
index 7caedd2..67bd66f 100644
--- a/gnetlist/src/s_hierarchy.c
+++ b/gnetlist/src/s_hierarchy.c
@@ -587,7 +587,6 @@ char *s_hierarchy_return_baseuref(TOPLEVEL * pr_current, char *uref)
char *return_value = NULL;
char *start_of_base = NULL;
char *end_of_base = NULL;
- char *cptr = NULL;
/* use hierarchy separator */
@@ -617,8 +616,6 @@ char *s_hierarchy_return_baseuref(TOPLEVEL * pr_current, char *uref)
return (g_strdup (uref));
}
- cptr = uref;
-
return_value = g_strndup(uref, end_of_base - uref);
}
diff --git a/gnetlist/src/s_net.c b/gnetlist/src/s_net.c
index 91378ec..0654d69 100644
--- a/gnetlist/src/s_net.c
+++ b/gnetlist/src/s_net.c
@@ -149,8 +149,6 @@ char *s_net_return_connected_string(TOPLEVEL * pr_current, OBJECT * object,
char *temp_uref = NULL;
char *string;
char *misc;
- int hierarchy_tag_len = 0;
-
o_current = object;
@@ -166,12 +164,6 @@ char *s_net_return_connected_string(TOPLEVEL * pr_current, OBJECT * object,
temp_uref = scm_to_utf8_string (scm_uref);
}
- if (hierarchy_tag) {
- hierarchy_tag_len = strlen(hierarchy_tag)+1;
- } else {
- hierarchy_tag_len = 0;
- }
-
/* apply the hierarchy name to the uref */
uref = s_hierarchy_create_uref(pr_current, temp_uref, hierarchy_tag);
@@ -352,7 +344,6 @@ char *s_net_name (TOPLEVEL * pr_current, NETLIST * netlist_head,
CPINLIST *pl_current;
char *net_name = NULL;
int found = 0;
- int hierarchy_tag_len;
char *temp;
int *unnamed_counter;
char *unnamed_string;
@@ -417,13 +408,6 @@ char *s_net_name (TOPLEVEL * pr_current, NETLIST * netlist_head,
}
- if (hierarchy_tag) {
- /* + 1 is for the '/' character */
- hierarchy_tag_len = strlen(hierarchy_tag) + 1;
- } else {
- hierarchy_tag_len = 0;
- }
-
switch (type) {
case PIN_TYPE_NET:
unnamed_counter = &unnamed_net_counter;
diff --git a/gnetlist/src/s_netlist.c b/gnetlist/src/s_netlist.c
index ba2c98f..c4bf1d9 100644
--- a/gnetlist/src/s_netlist.c
+++ b/gnetlist/src/s_netlist.c
@@ -142,14 +142,12 @@ void s_netlist_post_process(TOPLEVEL * pr_current, NETLIST * head)
{
NETLIST *nl_current;
CPINLIST *pl_current;
- int vi = 0;
nl_current = head;
if (verbose_mode) {
printf("\n- Staring post processing\n");
printf("- Naming nets:\n");
- vi = 0;
}
/* this pass gives all nets a name, whether specified or creates a */
commit decfce058604a9d8a595b7917234d8a0b0e715c2
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
gschem: Fix some "set but not used" warnings.
diff --git a/gschem/src/m_basic.c b/gschem/src/m_basic.c
index 2219db4..e5e3ce5 100644
--- a/gschem/src/m_basic.c
+++ b/gschem/src/m_basic.c
@@ -242,14 +242,13 @@ int snap_grid(GSCHEM_TOPLEVEL *w_current, int input)
*/
int SCREENabs(GSCHEM_TOPLEVEL *w_current, int val)
{
- double fs,f0,f1,f;
+ double f0,f1,f;
double i;
int j;
f0 = w_current->toplevel->page_current->left;
f1 = w_current->toplevel->page_current->right;
- fs = w_current->toplevel->width;
f = w_current->toplevel->width / (f1 - f0);
i = f * (double)(val);
diff --git a/gschem/src/x_event.c b/gschem/src/x_event.c
index 58dfe28..829d531 100644
--- a/gschem/src/x_event.c
+++ b/gschem/src/x_event.c
@@ -525,7 +525,6 @@ gint x_event_button_pressed(GtkWidget *widget, GdkEventButton *event,
gint x_event_button_released(GtkWidget *widget, GdkEventButton *event,
GSCHEM_TOPLEVEL *w_current)
{
- int w_x, w_y;
int unsnapped_wx, unsnapped_wy;
exit_if_null(w_current);
@@ -540,8 +539,6 @@ gint x_event_button_released(GtkWidget *widget, GdkEventButton *event,
SCREENtoWORLD (w_current, (int) event->x, (int) event->y,
&unsnapped_wx, &unsnapped_wy);
- w_x = snap_grid (w_current, unsnapped_wx);
- w_y = snap_grid (w_current, unsnapped_wy);
/* Huge switch statement to evaluate state transitions. Jump to
* end_button_released label to escape the state evaluation rather
diff --git a/gschem/src/x_multiattrib.c b/gschem/src/x_multiattrib.c
index e00cde9..ee2a5f9 100644
--- a/gschem/src/x_multiattrib.c
+++ b/gschem/src/x_multiattrib.c
@@ -660,7 +660,6 @@ static void multiattrib_action_add_attribute(GSCHEM_TOPLEVEL *w_current,
gint visible,
gint show_name_value)
{
- OBJECT *o_attrib;
gchar *newtext;
newtext = g_strdup_printf ("%s=%s", name, value);
@@ -671,8 +670,8 @@ static void multiattrib_action_add_attribute(GSCHEM_TOPLEVEL *w_current,
}
/* create a new attribute and link it */
- o_attrib = o_attrib_add_attrib (w_current, newtext,
- visible, show_name_value, object);
+ o_attrib_add_attrib (w_current, newtext,
+ visible, show_name_value, object);
w_current->toplevel->page_current->CHANGED = 1;
o_undo_savestate (w_current, UNDO_ALL);
@@ -690,15 +689,14 @@ static void multiattrib_action_duplicate_attribute(GSCHEM_TOPLEVEL *w_current,
OBJECT *object,
OBJECT *o_attrib)
{
- OBJECT *o_new;
int visibility = o_is_visible (w_current->toplevel, o_attrib)
? VISIBLE : INVISIBLE;
- o_new = o_attrib_add_attrib (w_current,
- o_text_get_string (w_current->toplevel, o_attrib),
- visibility,
- o_attrib->show_name_value,
- object);
+ o_attrib_add_attrib (w_current,
+ o_text_get_string (w_current->toplevel, o_attrib),
+ visibility,
+ o_attrib->show_name_value,
+ object);
w_current->toplevel->page_current->CHANGED = 1;
o_undo_savestate (w_current, UNDO_ALL);
@@ -2144,7 +2142,6 @@ static void multiattrib_get_property (GObject *object,
*/
void multiattrib_update (Multiattrib *multiattrib)
{
- TOPLEVEL *toplevel;
GtkListStore *liststore;
GtkTreeIter iter;
GList *object_attribs;
@@ -2155,7 +2152,6 @@ void multiattrib_update (Multiattrib *multiattrib)
gboolean show_inherited;
g_assert (GSCHEM_DIALOG (multiattrib)->w_current != NULL);
- toplevel = GSCHEM_DIALOG (multiattrib)->w_current->toplevel;
/* clear the list of attributes */
liststore = (GtkListStore*)gtk_tree_view_get_model (multiattrib->treeview);
commit dc65cd116b28138f28c7823c908740d8129042d6
Author: Peter TB Brett <peter@xxxxxxxxxxxxx>
Commit: Peter TB Brett <peter@xxxxxxxxxxxxx>
libgeda: Fix some "set but not used" warnings.
diff --git a/libgeda/src/o_arc_basic.c b/libgeda/src/o_arc_basic.c
index 39b0e8f..52dadaf 100644
--- a/libgeda/src/o_arc_basic.c
+++ b/libgeda/src/o_arc_basic.c
@@ -860,7 +860,7 @@ void o_arc_print_dashed(TOPLEVEL *toplevel, FILE *fp,
int arc_width, int length, int space,
int origin_x, int origin_y)
{
- int da, db, a1, a2, d;
+ int da, db, a1, d;
f_print_set_color(toplevel, fp, color);
@@ -917,10 +917,8 @@ void o_arc_print_dashed(TOPLEVEL *toplevel, FILE *fp,
if ((d + da) < (angle1 + angle2)) {
a1 = d;
- a2 = da;
} else {
a1 = d;
- a2 = (angle1 + angle2) - d;
}
fprintf(fp,"[%d %d] ",
@@ -967,7 +965,7 @@ void o_arc_print_center(TOPLEVEL *toplevel, FILE *fp,
int arc_width, int length, int space,
int origin_x, int origin_y)
{
- int da, db, a1, a2, d;
+ int da, db, a1, d;
f_print_set_color(toplevel, fp, color);
@@ -1031,12 +1029,10 @@ void o_arc_print_center(TOPLEVEL *toplevel, FILE *fp,
if ((d + da) < (angle1 + angle2)) {
a1 = d;
- a2 = da;
d = d + da;
} else {
a1 = d;
- a2 = (angle1 + angle2) - d;
d = d + da;
}
@@ -1097,7 +1093,7 @@ void o_arc_print_phantom(TOPLEVEL *toplevel, FILE *fp,
int arc_width, int length, int space,
int origin_x, int origin_y)
{
- int da, db, a1, a2, d;
+ int da, db, a1, d;
f_print_set_color(toplevel, fp, color);
@@ -1175,11 +1171,9 @@ void o_arc_print_phantom(TOPLEVEL *toplevel, FILE *fp,
if ((d + da) < (angle1 + angle2)) {
a1 = d;
- a2 = da;
d = d + da;
} else {
a1 = d;
- a2 = (angle1 + angle2) - d;
d = d + da;
}
diff --git a/libgeda/src/o_bus_basic.c b/libgeda/src/o_bus_basic.c
index ae22db7..ac1841e 100644
--- a/libgeda/src/o_bus_basic.c
+++ b/libgeda/src/o_bus_basic.c
@@ -277,8 +277,7 @@ OBJECT *o_bus_copy(TOPLEVEL *toplevel, OBJECT *o_current)
void o_bus_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
int origin_x, int origin_y)
{
- int offset, offset2;
- int cross, bus_width;
+ int bus_width;
int x1, y1;
int x2, y2;
@@ -287,11 +286,6 @@ void o_bus_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
return;
}
- offset = 7*6;
- offset2 = 7;
-
- cross = offset;
-
f_print_set_color(toplevel, fp, o_current->color);
bus_width = 2;
diff --git a/libgeda/src/o_net_basic.c b/libgeda/src/o_net_basic.c
index 443cb4c..3fa642f 100644
--- a/libgeda/src/o_net_basic.c
+++ b/libgeda/src/o_net_basic.c
@@ -263,8 +263,7 @@ OBJECT *o_net_copy(TOPLEVEL *toplevel, OBJECT *o_current)
void o_net_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
int origin_x, int origin_y)
{
- int offset, offset2;
- int cross, net_width;
+ int net_width;
int x1, y1;
int x2, y2;
@@ -273,11 +272,6 @@ void o_net_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
return;
}
- offset = 7 * 6;
- offset2 = 7;
-
- cross = offset;
-
f_print_set_color(toplevel, fp, o_current->color);
net_width = 2;
diff --git a/libgeda/src/o_path_basic.c b/libgeda/src/o_path_basic.c
index e5b907b..b5c34d5 100644
--- a/libgeda/src/o_path_basic.c
+++ b/libgeda/src/o_path_basic.c
@@ -899,14 +899,11 @@ static void o_path_print_mesh (TOPLEVEL *toplevel, FILE *fp, PATH *path,
void o_path_print(TOPLEVEL *toplevel, FILE *fp, OBJECT *o_current,
int origin_x, int origin_y)
{
- int color;
int line_width, length, space;
int fill_width, angle1, pitch1, angle2, pitch2;
DRAW_FUNC outl_func = NULL;
FILL_FUNC fill_func = NULL;
- color = o_current->color;
-
/*! \note
* Depending on the type of the line for this particular path, the
* appropriate function is chosen among #o_path_print_solid(),
diff --git a/libgeda/src/o_text_basic.c b/libgeda/src/o_text_basic.c
index a46137c..2b7afe0 100644
--- a/libgeda/src/o_text_basic.c
+++ b/libgeda/src/o_text_basic.c
@@ -569,7 +569,7 @@ OBJECT *o_text_copy(TOPLEVEL *toplevel, OBJECT *o_current)
void o_text_print_text_string(FILE *fp, char *string, int unicode_count,
gunichar *unicode_table)
{
- int len, j;
+ int j;
gchar *aux;
gunichar current_char, c;
@@ -579,8 +579,7 @@ void o_text_print_text_string(FILE *fp, char *string, int unicode_count,
}
aux = string;
- len = g_utf8_strlen(string, -1);
-
+
fprintf(fp, "(");
while (aux && ((gunichar) (*aux) != 0)) {
diff --git a/libgeda/src/s_slib.c b/libgeda/src/s_slib.c
index 5db771e..d38e0d5 100644
--- a/libgeda/src/s_slib.c
+++ b/libgeda/src/s_slib.c
@@ -208,7 +208,6 @@ char *s_slib_search_lowlevel(const char *basename)
char *s_slib_getbasename(const char *rawname)
{
char *return_filename;
- char *copy;
int i;
int done=0;
int lastchar;
@@ -233,10 +232,6 @@ char *s_slib_getbasename(const char *rawname)
return_filename[i] = '\0';
-
- /* keep filename for safe keeping */
- copy = return_filename;
-
/* skip null terminator */
i--;
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs