empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

actofgod: Simplify fmtflags()'s error checking

Browse source 
Permit finding length by passing no buffer.  Not currently used.

Oops at most once.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-08-25 09:51:39 +02:00
parent 1a27107bed
commit 4f6a3c9aae
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/lib/subs/actofgod.c
View file

@ -210,7 +210,7 @@ fmtflags (char *buf, size_t sz, int flags, struct symbol symtab[], int all)
int n, i; int n, i;
char *p; char *p;
if (sz) if (buf && sz)
buf[0] = 0; buf[0] = 0;
n = 0; n = 0;
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
@ -221,12 +221,12 @@ fmtflags (char *buf, size_t sz, int flags, struct symbol symtab[], int all)
n += snprintf(buf + n, sz - n, "%s%s", sep, p); n += snprintf(buf + n, sz - n, "%s%s", sep, p);
else if (all) else if (all)
n += snprintf(buf + n, sz - n, "%s#%d", sep, i); n += snprintf(buf + n, sz - n, "%s#%d", sep, i);
if (CANT_HAPPEN((size_t)n >= sz)) { if ((size_t)n >= sz)
buf = NULL;
sz = n; sz = n;
}
sep = ", "; sep = ", ";
} }
CANT_HAPPEN((size_t)n >= sz && buf);
return n; return n;
} }