luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

inpcom.c, local scope for some vars

This commit is contained in:
rlar 2013-06-02 11:54:11 +02:00
parent 01fe243032
commit 726162669b
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/frontend/inpcom.c
View File

@ -302,7 +302,7 @@ inp_readall(FILE *fp, int call_depth, char *dir_name, bool comfile, bool intfile
*/
{
struct line *end = NULL, *cc = NULL, *prev, *working, *newcard;
char *buffer = NULL, c;
char *buffer = NULL;
/* segfault fix */
#ifdef XSPICE
char big_buff[5000];
@ -313,14 +313,9 @@ inp_readall(FILE *fp, int call_depth, char *dir_name, bool comfile, bool intfile
#endif
char *new_title = NULL;
int line_number = 1; /* sjb - renamed to avoid confusion with struct line */
int line_number_orig = 1, line_number_inc = 1;
unsigned int no_braces = 0; /* number of '{' */
int line_number_orig = 1;
int cirlinecount = 0; /* length of circarray */
size_t max_line_length = 0; /* max. line length in input deck */
struct line *tmp_ptr1 = NULL;
bool found_end = FALSE, shell_eol_continuation = FALSE;
if (call_depth == 0) {
@ -514,9 +509,9 @@ inp_readall(FILE *fp, int call_depth, char *dir_name, bool comfile, bool intfile
end->li_line = copy(buffer);
end->li_linenum = end->li_linenum_orig = line_number++;
if (newcard) {
int line_number_inc = 1;
end->li_next = newcard;
/* Renumber the lines */
line_number_inc = 1;
for (end = newcard; end && end->li_next; end = end->li_next) {
end->li_linenum = line_number++;
end->li_linenum_orig = line_number_inc++;
@ -655,7 +650,7 @@ inp_readall(FILE *fp, int call_depth, char *dir_name, bool comfile, bool intfile
prev = NULL;
while (working) {
char *s;
char *s, c;
for (s = working->li_line; (c = *s) != '\0' && c <= ' '; s++)
;
@ -723,6 +718,11 @@ inp_readall(FILE *fp, int call_depth, char *dir_name, bool comfile, bool intfile
if (call_depth == 0) {
unsigned int no_braces; /* number of '{' */
size_t max_line_length; /* max. line length in input deck */
struct line *tmp_ptr1;
struct names *subckt_w_params = new_names();
inp_fix_for_numparam(subckt_w_params, working);
@ -777,6 +777,7 @@ inp_readall(FILE *fp, int call_depth, char *dir_name, bool comfile, bool intfile
of parameter substitutions in a line*/
dynmaxline = 0;
max_line_length = 0;
no_braces = 0;
for (tmp_ptr1 = cc; tmp_ptr1; tmp_ptr1 = tmp_ptr1->li_next) {
char *s;
unsigned int braces_per_line = 0;