oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

avoid shadowing div

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@14696 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-03-30 16:43:52 +00:00
parent 4e447ca6d4
commit dbba0be7b2
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/roken/parse_units.c
View File

@@ -192,9 +192,8 @@ parse_flags (const char *s, const struct units *units,
static int static int
unparse_something (int num, const struct units *units, char *s, size_t len, unparse_something (int num, const struct units *units, char *s, size_t len,
int (*print) (char *s, size_t len, int div, int (*print) (char *, size_t, int, const char *, int),
const char *name, int rem), int (*update) (int, unsigned),
int (*update) (int in, unsigned mult),
const char *zero_string) const char *zero_string)
{ {
const struct units *u; const struct units *u;
@@ -204,12 +203,12 @@ unparse_something (int num, const struct units *units, char *s, size_t len,
return snprintf (s, len, "%s", zero_string); return snprintf (s, len, "%s", zero_string);
for (u = units; num > 0 && u->name; ++u) { for (u = units; num > 0 && u->name; ++u) {
int div; int divisor;
div = num / u->mult; divisor = num / u->mult;
if (div) { if (div) {
num = (*update) (num, u->mult); num = (*update) (num, u->mult);
tmp = (*print) (s, len, div, u->name, num); tmp = (*print) (s, len, divisor, u->name, num);
if (tmp < 0) if (tmp < 0)
return tmp; return tmp;
if (tmp > len) { if (tmp > len) {
@@ -226,11 +225,11 @@ unparse_something (int num, const struct units *units, char *s, size_t len,
} }
static int static int
print_unit (char *s, size_t len, int div, const char *name, int rem) print_unit (char *s, size_t len, int divisor, const char *name, int rem)
{ {
return snprintf (s, len, "%u %s%s%s", return snprintf (s, len, "%u %s%s%s",
div, name, divisor, name,
div == 1 ? "" : "s", divisor == 1 ? "" : "s",
rem > 0 ? " " : ""); rem > 0 ? " " : "");
} }
@@ -301,7 +300,7 @@ print_units_table (const struct units *units, FILE *f)
} }
static int static int
print_flag (char *s, size_t len, int div, const char *name, int rem) print_flag (char *s, size_t len, int divisor, const char *name, int rem)
{ {
return snprintf (s, len, "%s%s", name, rem > 0 ? ", " : ""); return snprintf (s, len, "%s%s", name, rem > 0 ? ", " : "");
} }