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

use int instead of size_t as return values to be compatible with snprintf

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10655 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-09-04 09:56:00 +00:00
parent e5dc1de327
commit 0a5f6ffdd9
5 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/roken/parse_units.c
View File

@@ -190,7 +190,7 @@ parse_flags (const char *s, const struct units *units,
* with maximum length `len'. The actual length is the function value.
*/
static size_t
static int
unparse_something (int num, const struct units *units, char *s, size_t len,
int (*print) (char *s, size_t len, int div,
const char *name, int rem),
@@ -198,7 +198,7 @@ unparse_something (int num, const struct units *units, char *s, size_t len,
const char *zero_string)
{
const struct units *u;
size_t ret = 0, tmp;
int ret = 0, tmp;
if (num == 0)
return snprintf (s, len, "%s", zero_string);
@@ -210,6 +210,8 @@ unparse_something (int num, const struct units *units, char *s, size_t len,
if (div) {
num = (*update) (num, u->mult);
tmp = (*print) (s, len, div, u->name, num);
if (tmp < 0)
return tmp;
len -= tmp;
s += tmp;
@@ -243,7 +245,7 @@ update_unit_approx (int in, unsigned mult)
return update_unit (in, mult);
}
size_t
int
unparse_units (int num, const struct units *units, char *s, size_t len)
{
return unparse_something (num, units, s, len,
@@ -252,7 +254,7 @@ unparse_units (int num, const struct units *units, char *s, size_t len)
"0");
}
size_t
int
unparse_units_approx (int num, const struct units *units, char *s, size_t len)
{
return unparse_something (num, units, s, len,
@@ -306,7 +308,7 @@ update_flag (int in, unsigned mult)
return in - mult;
}
size_t
int
unparse_flags (int num, const struct units *units, char *s, size_t len)
{
return unparse_something (num, units, s, len,