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

textdisp.c, minor rewrite to swallow type conversion warnings

This commit is contained in:
rlar 2011-07-01 16:03:52 +00:00
parent 7dfe20bb21
commit b06eb95b87
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-07-01 Robert Larice
* src/frontend/help/textdisp.c :
textdisp.c, minor rewrite to swallow type conversion warnings
2011-06-30 Robert Larice
* src/frontend/com_measure2.c :
surpress warnings, disable currently unused functions

26
src/frontend/help/textdisp.c
View File

@ -164,41 +164,45 @@ putline(char *s)
static int
putstuff(toplink *tl, int base)
{
unsigned int maxwidth = 0;
int maxwidth = 0;
int ncols, nrows, nbuts = 0, i, j, k;
toplink *tt;
for (tt = tl; tt; tt = tt->next) {
if (strlen(tt->description) + 5 > maxwidth)
maxwidth = strlen(tt->description) + 5;
if (maxwidth < (int) strlen(tt->description))
maxwidth = (int) strlen(tt->description);
nbuts++;
}
ncols = hlp_width / maxwidth;
if (!ncols) {
ncols = hlp_width / (maxwidth + 5);
if (ncols < 1) {
fprintf(stderr, "Help, button too big!!\n");
return (0);
}
if (ncols > nbuts)
ncols = nbuts;
maxwidth = hlp_width / ncols;
nrows = nbuts / ncols;
if (nrows * ncols < nbuts)
nrows++;
/* round up */
nrows = (nbuts + ncols - 1) / ncols;
for (i = 0; i < nrows; i++) {
for (tt = tl, j = 0; j < i; j++, tt = tt->next)
;
for (j = 0; j < ncols; j++) {
if (tt)
out_printf("%2d) %-*s ", base + j * nrows + i +
1, maxwidth - 5, tt->description);
out_printf("%2d) %-*s ", base + j * nrows + i + 1,
maxwidth - 5, tt->description);
for (k = 0; k < nrows; k++)
if (tt)
tt = tt->next;
}
out_printf("\n");
}
return (nbuts);
}