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

numparm, un-pascal-ify, use '\r' '\n' '\t'

This commit is contained in:
rlar 2011-02-19 14:54:00 +00:00
parent 5e30c39384
commit 6349bc4fbf
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-02-19 Robert Larice
* src/frontend/numparam/mystring.c ,
* src/frontend/numparam/nupatest.c :
numparm, un-pascal-ify, use '\r' '\n' '\t'
2011-02-19 Robert Larice 2011-02-19 Robert Larice
* src/frontend/numparam/general.h , * src/frontend/numparam/general.h ,
* src/frontend/numparam/mystring.c : * src/frontend/numparam/mystring.c :

5
src/frontend/numparam/mystring.c
View File

@ -78,8 +78,7 @@ rs ( SPICE_DSTRINGPTR dstr_p)
c = fgetc (stdin); c = fgetc (stdin);
cadd (dstr_p, c); cadd (dstr_p, c);
} }
while (!((c == Cr) || (c == '\n'))); while (!((c == '\r') || (c == '\n')));
/* return i */ ;
} }
char char
@ -594,7 +593,7 @@ freadstr (FILE * f, SPICE_DSTRINGPTR dstr_p)
do do
{ {
c = fgetc (f); /* tab is the only control char accepted */ c = fgetc (f); /* tab is the only control char accepted */
if (((c >= ' ') || (c < 0) || (c == Tab))) if (((c >= ' ') || (c < 0) || (c == '\t')))
{ {
str_load[0] = c; str_load[0] = c;
spice_dstring_append( dstr_p, str_load, 1 ) ; spice_dstring_append( dstr_p, str_load, 1 ) ;

2
src/frontend/numparam/nupatest.c
View File

@ -157,7 +157,7 @@ void rs(char * s) /* 78 coumn limit */
if ( (c>=' ')&&(c<='~') && (i<max) ) { if ( (c>=' ')&&(c<='~') && (i<max) ) {
cadd(s,c); Inc(i); cadd(s,c); Inc(i);
} }
done= (c==Lf) || (c==Cr); done= (c=='\n') || (c=='\r');
} }
} }
#endif #endif