diff --git a/ChangeLog b/ChangeLog index 5658af7d4..2ea6f4cbc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-11-23 Robert Larice + * src/frontend/inpcom.c , + * src/frontend/plotting/grid.c : + swallow type conversion warnings + 2010-11-23 Robert Larice * src/xspice/ipc/ipcaegis.c : fix an ancient bug (typo `!=' versus `=!') diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index 265e1fe9c..f60117f5d 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -1082,7 +1082,7 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name, bool c char keep_char; int line_number = 1; /* sjb - renamed to avoid confusion with struct line */ int line_number_orig = 1, line_number_lib = 1, line_number_inc = 1; - int no_braces = 0; /* number of '{' */ + unsigned int no_braces = 0; /* number of '{' */ FILE *newfp; FILE *fdo; struct line *tmp_ptr1 = NULL; @@ -1658,7 +1658,7 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name, bool c dynLlen = 0; for(tmp_ptr1 = cc; tmp_ptr1 != NULL; tmp_ptr1 = tmp_ptr1->li_next) { char *s; - int braces_per_line = 0; + unsigned int braces_per_line = 0; /* count number of lines */ dynmaxline++; /* renumber the lines of the processed input deck */ diff --git a/src/frontend/plotting/grid.c b/src/frontend/plotting/grid.c index 4fc2e2baa..9668fb462 100644 --- a/src/frontend/plotting/grid.c +++ b/src/frontend/plotting/grid.c @@ -360,7 +360,7 @@ lingrid(GRAPH *graph, double lo, double hi, double delta, int type, Axis axis) int i; double step; - static struct { float div_lim, step; } div_list[ ] = { + static struct { double div_lim, step; } div_list[ ] = { { 100.0, 10.0 }, { 50.0, 5.0 }, { 20.0, 2.0 },