numparm, un-pascal-ify, use '\r' '\n' '\t'
This commit is contained in:
parent
5e30c39384
commit
6349bc4fbf
|
|
@ -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
|
||||
* src/frontend/numparam/general.h ,
|
||||
* src/frontend/numparam/mystring.c :
|
||||
|
|
|
|||
|
|
@ -78,8 +78,7 @@ rs ( SPICE_DSTRINGPTR dstr_p)
|
|||
c = fgetc (stdin);
|
||||
cadd (dstr_p, c);
|
||||
}
|
||||
while (!((c == Cr) || (c == '\n')));
|
||||
/* return i */ ;
|
||||
while (!((c == '\r') || (c == '\n')));
|
||||
}
|
||||
|
||||
char
|
||||
|
|
@ -594,7 +593,7 @@ freadstr (FILE * f, SPICE_DSTRINGPTR dstr_p)
|
|||
do
|
||||
{
|
||||
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;
|
||||
spice_dstring_append( dstr_p, str_load, 1 ) ;
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ void rs(char * s) /* 78 coumn limit */
|
|||
if ( (c>=' ')&&(c<='~') && (i<max) ) {
|
||||
cadd(s,c); Inc(i);
|
||||
}
|
||||
done= (c==Lf) || (c==Cr);
|
||||
done= (c=='\n') || (c=='\r');
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue