Browse Source

numparm, cleanup some small functions

pre-master-46
rlar 15 years ago
parent
commit
5e30c39384
  1. 5
      ChangeLog
  2. 2
      src/frontend/numparam/general.h
  3. 46
      src/frontend/numparam/mystring.c

5
ChangeLog

@ -1,3 +1,8 @@
2011-02-19 Robert Larice
* src/frontend/numparam/general.h ,
* src/frontend/numparam/mystring.c :
numparm, cleanup some small functions
2011-02-19 Robert Larice 2011-02-19 Robert Larice
* src/frontend/numparam/spicenum.c , * src/frontend/numparam/spicenum.c ,
* src/frontend/numparam/xpressn.c : * src/frontend/numparam/xpressn.c :

2
src/frontend/numparam/general.h

@ -82,5 +82,5 @@ long absi( long i);
double frac(double x); double frac(double x);
void rawcopy(void * a, void * b, int la, int lb); void rawcopy(void * a, void * b, int la, int lb);
void * new(long sz);
void * new(size_t sz);
void dispose(void * p); void dispose(void * p);

46
src/frontend/numparam/mystring.c

@ -47,19 +47,13 @@ wc (char c)
void void
wln (void) wln (void)
{ {
wc ('\n');
fputc ('\n', stdout);
} }
void void
ws (char *s) ws (char *s)
{ {
int k = 0;
while (s[k] != 0)
{
wc (s[k]);
k++;
}
fputs(s, stdout);
} }
void void
@ -152,12 +146,7 @@ sfix ( SPICE_DSTRINGPTR dstr_p, int len)
int int
length (char *s) length (char *s)
{ {
int lg = 0;
while (s[lg])
lg++;
return lg;
return (int) strlen(s);
} }
/* ----------------------------------------------------------------- /* -----------------------------------------------------------------
@ -539,17 +528,13 @@ scompare (char *a, char *b)
bool bool
steq (char *a, char *b) /* string a==b test */ steq (char *a, char *b) /* string a==b test */
{ {
unsigned short j = 0;
while ((a[j] == b[j]) && (a[j] != 0) && (b[j] != 0))
j++;
return ((a[j] == 0) && (b[j] == 0)) /* string equality test */ ;
return strcmp (a, b) == 0;
} }
bool bool
stne (char *s, char *t) stne (char *s, char *t)
{ {
return scompare (s, t) != 0;
return strcmp (s, t) != 0;
} }
int int
@ -685,22 +670,15 @@ dispose (void *p)
} }
void * void *
new (long sz)
new (size_t sz)
{ {
void *p;
if (sz <= 0)
return NULL;
else
{
p = tmalloc (sz);
if (p == NULL)
{
/* fatal error */
ws (" new() failure. Program halted.\n");
controlled_exit(EXIT_FAILURE);
}
return p;
void *p = tmalloc (sz);
if (p == NULL)
{ /* fatal error */
ws (" new() failure. Program halted.\n");
controlled_exit(EXIT_FAILURE);
} }
return p;
} }
/***** elementary math *******/ /***** elementary math *******/

Loading…
Cancel
Save