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

rename 'struct state' -> 'struct snprintf_test' to avoid collision

Browse Source 
with resolv.h on aix


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10704 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-09-17 00:53:23 +00:00
parent 7e42abe154
commit 53395dd12a
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/roken/snprintf.c
View File

@@ -54,13 +54,13 @@ enum format_flags {
* Common state * Common state
*/ */
struct state { struct snprintf_state {
unsigned char *str; unsigned char *str;
unsigned char *s; unsigned char *s;
unsigned char *theend; unsigned char *theend;
size_t sz; size_t sz;
size_t max_sz; size_t max_sz;
void (*append_char)(struct state *, unsigned char); void (*append_char)(struct snprintf_state *, unsigned char);
/* XXX - methods */ /* XXX - methods */
}; };
@@ -70,13 +70,13 @@ struct state {
#if !defined(HAVE_VSNPRINTF) || defined(TEST_SNPRINTF) #if !defined(HAVE_VSNPRINTF) || defined(TEST_SNPRINTF)
static int static int
sn_reserve (struct state *state, size_t n) sn_reserve (struct snprintf_state *state, size_t n)
{ {
return state->s + n > state->theend; return state->s + n > state->theend;
} }
static void static void
sn_append_char (struct state *state, unsigned char c) sn_append_char (struct snprintf_state *state, unsigned char c)
{ {
if (!sn_reserve (state, 1)) if (!sn_reserve (state, 1))
*state->s++ = c; *state->s++ = c;
@@ -84,7 +84,7 @@ sn_append_char (struct state *state, unsigned char c)
#endif #endif
static int static int
as_reserve (struct state *state, size_t n) as_reserve (struct snprintf_state *state, size_t n)
{ {
if (state->s + n > state->theend) { if (state->s + n > state->theend) {
int off = state->s - state->str; int off = state->s - state->str;
@@ -107,7 +107,7 @@ as_reserve (struct state *state, size_t n)
} }
static void static void
as_append_char (struct state *state, unsigned char c) as_append_char (struct snprintf_state *state, unsigned char c)
{ {
if(!as_reserve (state, 1)) if(!as_reserve (state, 1))
*state->s++ = c; *state->s++ = c;
@@ -134,7 +134,7 @@ use_alternative (int flags, u_longest num, unsigned base)
} }
static int static int
append_number(struct state *state, append_number(struct snprintf_state *state,
u_longest num, unsigned base, char *rep, u_longest num, unsigned base, char *rep,
int width, int prec, int flags, int minusp) int width, int prec, int flags, int minusp)
{ {
@@ -218,7 +218,7 @@ append_number(struct state *state,
*/ */
static int static int
append_string (struct state *state, append_string (struct snprintf_state *state,
const unsigned char *arg, const unsigned char *arg,
int width, int width,
int prec, int prec,
@@ -258,7 +258,7 @@ append_string (struct state *state,
} }
static int static int
append_char(struct state *state, append_char(struct snprintf_state *state,
unsigned char arg, unsigned char arg,
int width, int width,
int flags) int flags)
@@ -311,7 +311,7 @@ else \
*/ */
static int static int
xyzprintf (struct state *state, const char *char_format, va_list ap) xyzprintf (struct snprintf_state *state, const char *char_format, va_list ap)
{ {
const unsigned char *format = (const unsigned char *)char_format; const unsigned char *format = (const unsigned char *)char_format;
unsigned char c; unsigned char c;
@@ -592,7 +592,7 @@ int
vasnprintf (char **ret, size_t max_sz, const char *format, va_list args) vasnprintf (char **ret, size_t max_sz, const char *format, va_list args)
{ {
int st; int st;
struct state state; struct snprintf_state state;
state.max_sz = max_sz; state.max_sz = max_sz;
state.sz = 1; state.sz = 1;
@@ -630,7 +630,7 @@ vasnprintf (char **ret, size_t max_sz, const char *format, va_list args)
int int
vsnprintf (char *str, size_t sz, const char *format, va_list args) vsnprintf (char *str, size_t sz, const char *format, va_list args)
{ {
struct state state; struct snprintf_state state;
int ret; int ret;
unsigned char *ustr = (unsigned char *)str; unsigned char *ustr = (unsigned char *)str;