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

type modifier, parameter graph removed from SetColor()

This commit is contained in:
Jim Monte 2020-04-25 19:14:31 +02:00 committed by Holger Vogt
parent 5b98b1e723
commit a3a8bc702d
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/dimens.c
View File

@ -213,7 +213,7 @@ static int atodims_bracketed(const char *p, int *data, int *p_n_dim)
int rc = get_bracketed_dim(p, data + n_dim); int rc = get_bracketed_dim(p, data + n_dim);
if (rc <= 0) { /* error or normal exit */ if (rc <= 0) { /* error or normal exit */
*p_n_dim = n_dim; *p_n_dim = (int) n_dim;
return !!rc; return !!rc;
} }
p += rc; /* step after the dimension that was processed */ p += rc; /* step after the dimension that was processed */
@ -283,10 +283,10 @@ static int atodims_csv(const char *p, int *data, int *p_n_dim)
++p; ++p;
break; break;
case ']': /* ] ended scan */ case ']': /* ] ended scan */
*p_n_dim = n_dim; *p_n_dim = (int) n_dim;
return (int) (p - p0) + 1; return (int) (p - p0) + 1;
case '\0': /* end of string ended scan */ case '\0': /* end of string ended scan */
*p_n_dim = n_dim; *p_n_dim = (int) n_dim;
return 0; return 0;
default: /* invalid char */ default: /* invalid char */
return -1; return -1;
@ -347,7 +347,7 @@ static int get_dim(const char *p, int *p_val)
const char *p0 = p; const char *p0 = p;
for ( ; ; ++p) { for ( ; ; ++p) {
const char c_cur = *p; const char c_cur = *p;
unsigned int digit_cur = c_cur - '0'; unsigned int digit_cur = (unsigned int) (c_cur - '0');
unsigned int val_new; unsigned int val_new;
if (digit_cur > 9) { /* not a digit */ if (digit_cur > 9) { /* not a digit */
if ((*p_val = (int) val) < 0) { /* overflow */ if ((*p_val = (int) val) < 0) { /* overflow */

9
src/frontend/display.c
View File

@ -246,10 +246,9 @@ DevDrawArc(int x0, int y0, int radius, double theta, double delta_theta)
} }
void void DevDrawText(const char *text, int x, int y, int angle)
DevDrawText(char *text, int x, int y, int angle)
{ {
dispdev->DrawText (text, x, y, angle); dispdev->DrawText(text, x, y, angle);
} }
@ -275,9 +274,9 @@ SetLinestyle(int linestyleid)
void void
SetColor(int colorid, GRAPH *graph) SetColor(int colorid)
{ {
dispdev->SetColor (colorid, graph); dispdev->SetColor(colorid);
} }