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

Add size_t formater (z modifer).

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@18000 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2006-09-05 08:03:36 +00:00
parent d6f4835198
commit bd56a65692
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/roken/snprintf.c
View File

@@ -325,6 +325,8 @@ if (long_long_flag) \
res = (unsig long long)va_arg(arg, unsig long long); \ res = (unsig long long)va_arg(arg, unsig long long); \
else if (long_flag) \ else if (long_flag) \
res = (unsig long)va_arg(arg, unsig long); \ res = (unsig long)va_arg(arg, unsig long); \
else if (size_t_flag) \
res = (unsig long)va_arg(arg, size_t); \
else if (short_flag) \ else if (short_flag) \
res = (unsig short)va_arg(arg, unsig int); \ res = (unsig short)va_arg(arg, unsig int); \
else \ else \
@@ -335,6 +337,8 @@ else \
#define PARSE_INT_FORMAT(res, arg, unsig) \ #define PARSE_INT_FORMAT(res, arg, unsig) \
if (long_flag) \ if (long_flag) \
res = (unsig long)va_arg(arg, unsig long); \ res = (unsig long)va_arg(arg, unsig long); \
else if (size_t_flag) \
res = (unsig long)va_arg(arg, size_t); \
else if (short_flag) \ else if (short_flag) \
res = (unsig short)va_arg(arg, unsig int); \ res = (unsig short)va_arg(arg, unsig int); \
else \ else \
@@ -358,6 +362,7 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap)
int flags = 0; int flags = 0;
int width = 0; int width = 0;
int prec = -1; int prec = -1;
int size_t_flag = 0;
int long_long_flag = 0; int long_long_flag = 0;
int long_flag = 0; int long_flag = 0;
int short_flag = 0; int short_flag = 0;
@@ -417,6 +422,9 @@ xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap)
if (c == 'h') { if (c == 'h') {
short_flag = 1; short_flag = 1;
c = *format++; c = *format++;
} else if (c == 'z') {
size_t_flag = 1;
c = *format++;
} else if (c == 'l') { } else if (c == 'l') {
long_flag = 1; long_flag = 1;
c = *format++; c = *format++;
@@ -687,7 +695,7 @@ vsnprintf (char *str, size_t sz, const char *format, va_list args)
state.append_char = sn_append_char; state.append_char = sn_append_char;
ret = xyzprintf (&state, format, args); ret = xyzprintf (&state, format, args);
if (state.s != NULL && sz != 0) if (state.s != NULL)
*state.s = '\0'; *state.s = '\0';
return ret; return ret;
} }