rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pgindent snprintf.c for consistency.

This commit is contained in:
Bruce Momjian 2005-03-16 15:12:18 +00:00
parent 2306f63dea
commit ca66797308
1 changed files with 141 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

275
src/port/snprintf.c
View File

@ -65,11 +65,11 @@
* causing nasty effects. * causing nasty effects.
**************************************************************/ **************************************************************/
/*static char _id[] = "$PostgreSQL: pgsql/src/port/snprintf.c,v 1.21 2005/03/16 15:11:43 momjian Exp $";*/ /*static char _id[] = "$PostgreSQL: pgsql/src/port/snprintf.c,v 1.22 2005/03/16 15:12:18 momjian Exp $";*/
int pg_snprintf(char *str, size_t count, const char *fmt,...); int pg_snprintf(char *str, size_t count, const char *fmt,...);
int pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args); int pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args);
int pg_printf(const char *format, ...); int pg_printf(const char *format,...);
static void dopr(char *buffer, const char *format, va_list args, char *end); static void dopr(char *buffer, const char *format, va_list args, char *end);
/* Prevent recursion */ /* Prevent recursion */
@ -81,7 +81,8 @@ static void dopr(char *buffer, const char *format, va_list args, char *end);
int int
pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args) pg_vsnprintf(char *str, size_t count, const char *fmt, va_list args)
{ {
char *end; char *end;
str[0] = '\0'; str[0] = '\0';
end = str + count - 1; end = str + count - 1;
dopr(str, fmt, args, end); dopr(str, fmt, args, end);
@ -107,14 +108,14 @@ pg_fprintf(FILE *stream, const char *fmt,...)
{ {
int len; int len;
va_list args; va_list args;
char* buffer[4096]; char *buffer[4096];
char* p; char *p;
va_start(args, fmt); va_start(args, fmt);
len = pg_vsnprintf((char*)buffer, (size_t)4096, fmt, args); len = pg_vsnprintf((char *) buffer, (size_t) 4096, fmt, args);
va_end(args); va_end(args);
p = (char*)buffer; p = (char *) buffer;
for( ;*p; p++) for (; *p; p++)
putc(*p, stream); putc(*p, stream);
return len; return len;
} }
@ -124,14 +125,14 @@ pg_printf(const char *fmt,...)
{ {
int len; int len;
va_list args; va_list args;
char* buffer[4096]; char *buffer[4096];
char* p; char *p;
va_start(args, fmt); va_start(args, fmt);
len = pg_vsnprintf((char*)buffer, (size_t)4096, fmt, args); len = pg_vsnprintf((char *) buffer, (size_t) 4096, fmt, args);
va_end(args); va_end(args);
p = (char*)buffer; p = (char *) buffer;
for( ;*p; p++) for (; *p; p++)
putchar(*p); putchar(*p);
return len; return len;
} }
@ -141,21 +142,21 @@ pg_printf(const char *fmt,...)
*/ */
static void fmtstr(char *value, int ljust, int len, int zpad, int maxwidth, static void fmtstr(char *value, int ljust, int len, int zpad, int maxwidth,
char *end, char **output); char *end, char **output);
static void fmtnum(int64 value, int base, int dosign, int ljust, int len, static void fmtnum(int64 value, int base, int dosign, int ljust, int len,
int zpad, char *end, char **output); int zpad, char *end, char **output);
static void fmtfloat(double value, char type, int ljust, int len, static void fmtfloat(double value, char type, int ljust, int len,
int precision, int pointflag, char *end, char **output); int precision, int pointflag, char *end, char **output);
static void dostr(char *str, int cut, char *end, char **output); static void dostr(char *str, int cut, char *end, char **output);
static void dopr_outch(int c, char *end, char **output); static void dopr_outch(int c, char *end, char **output);
#define FMTSTR 1 #define FMTSTR 1
#define FMTNUM 2 #define FMTNUM 2
#define FMTNUM_U 3 #define FMTNUM_U 3
#define FMTFLOAT 4 #define FMTFLOAT 4
#define FMTCHAR 5 #define FMTCHAR 5
#define FMTWIDTH 6 #define FMTWIDTH 6
#define FMTLEN 7 #define FMTLEN 7
static void static void
dopr(char *buffer, const char *format, va_list args, char *end) dopr(char *buffer, const char *format, va_list args, char *end)
@ -169,40 +170,41 @@ dopr(char *buffer, const char *format, va_list args, char *end)
int len; int len;
int zpad; int zpad;
int i; int i;
const char* format_save; const char *format_save;
const char* fmtbegin; const char *fmtbegin;
int fmtpos = 1; int fmtpos = 1;
int realpos = 0; int realpos = 0;
int precision; int precision;
int position; int position;
char *output; char *output;
int percents = 1; int percents = 1;
const char *p; const char *p;
struct fmtpar { struct fmtpar
const char* fmtbegin; {
const char* fmtend; const char *fmtbegin;
void* value; const char *fmtend;
int64 numvalue; void *value;
double fvalue; int64 numvalue;
int charvalue; double fvalue;
int ljust; int charvalue;
int len; int ljust;
int zpad; int len;
int maxwidth; int zpad;
int base; int maxwidth;
int dosign; int base;
char type; int dosign;
int precision; char type;
int pointflag; int precision;
char func; int pointflag;
int realpos; char func;
int longflag; int realpos;
int longlongflag; int longflag;
} *fmtpar, **fmtparptr; int longlongflag;
} *fmtpar, **fmtparptr;
/* Create enough structures to hold all arguments */ /* Create enough structures to hold all arguments */
for (p = format; *p != '\0'; p++) for (p = format; *p != '\0'; p++)
if (*p == '%') /* counts %% as two, so overcounts */ if (*p == '%') /* counts %% as two, so overcounts */
percents++; percents++;
#ifndef FRONTEND #ifndef FRONTEND
fmtpar = pgport_palloc(sizeof(struct fmtpar) * percents); fmtpar = pgport_palloc(sizeof(struct fmtpar) * percents);
@ -219,7 +221,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
exit(1); exit(1);
} }
#endif #endif
format_save = format; format_save = format;
output = buffer; output = buffer;
@ -255,7 +257,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
case '8': case '8':
case '9': case '9':
if (!pointflag) if (!pointflag)
{ {
len = len * 10 + ch - '0'; len = len * 10 + ch - '0';
position = position * 10 + ch - '0'; position = position * 10 + ch - '0';
} }
@ -275,7 +277,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
fmtpar[fmtpos].func = FMTLEN; fmtpar[fmtpos].func = FMTLEN;
else else
fmtpar[fmtpos].func = FMTWIDTH; fmtpar[fmtpos].func = FMTWIDTH;
fmtpar[fmtpos].realpos = realpos?realpos:fmtpos; fmtpar[fmtpos].realpos = realpos ? realpos : fmtpos;
fmtpos++; fmtpos++;
goto nextch; goto nextch;
case '.': case '.':
@ -288,17 +290,18 @@ dopr(char *buffer, const char *format, va_list args, char *end)
longflag = 1; longflag = 1;
goto nextch; goto nextch;
#ifdef NOT_USED #ifdef NOT_USED
/*
* We might export this to client apps so we should /*
* support 'qd' and 'I64d'(MinGW) also in case the * We might export this to client apps so we should
* native version does. * support 'qd' and 'I64d'(MinGW) also in case the
*/ * native version does.
*/
case 'q': case 'q':
longlongflag = 1; longlongflag = 1;
longflag = 1; longflag = 1;
goto nextch; goto nextch;
case 'I': case 'I':
if (*format == '6' && *(format+1) == '4') if (*format == '6' && *(format + 1) == '4')
{ {
format += 2; format += 2;
longlongflag = 1; longlongflag = 1;
@ -319,7 +322,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
fmtpar[fmtpos].len = len; fmtpar[fmtpos].len = len;
fmtpar[fmtpos].zpad = zpad; fmtpar[fmtpos].zpad = zpad;
fmtpar[fmtpos].func = FMTNUM_U; fmtpar[fmtpos].func = FMTNUM_U;
fmtpar[fmtpos].realpos = realpos?realpos:fmtpos; fmtpar[fmtpos].realpos = realpos ? realpos : fmtpos;
fmtpos++; fmtpos++;
break; break;
case 'o': case 'o':
@ -334,7 +337,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
fmtpar[fmtpos].len = len; fmtpar[fmtpos].len = len;
fmtpar[fmtpos].zpad = zpad; fmtpar[fmtpos].zpad = zpad;
fmtpar[fmtpos].func = FMTNUM_U; fmtpar[fmtpos].func = FMTNUM_U;
fmtpar[fmtpos].realpos = realpos?realpos:fmtpos; fmtpar[fmtpos].realpos = realpos ? realpos : fmtpos;
fmtpos++; fmtpos++;
break; break;
case 'd': case 'd':
@ -349,7 +352,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
fmtpar[fmtpos].len = len; fmtpar[fmtpos].len = len;
fmtpar[fmtpos].zpad = zpad; fmtpar[fmtpos].zpad = zpad;
fmtpar[fmtpos].func = FMTNUM; fmtpar[fmtpos].func = FMTNUM;
fmtpar[fmtpos].realpos = realpos?realpos:fmtpos; fmtpar[fmtpos].realpos = realpos ? realpos : fmtpos;
fmtpos++; fmtpos++;
break; break;
case 'x': case 'x':
@ -363,7 +366,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
fmtpar[fmtpos].len = len; fmtpar[fmtpos].len = len;
fmtpar[fmtpos].zpad = zpad; fmtpar[fmtpos].zpad = zpad;
fmtpar[fmtpos].func = FMTNUM_U; fmtpar[fmtpos].func = FMTNUM_U;
fmtpar[fmtpos].realpos = realpos?realpos:fmtpos; fmtpar[fmtpos].realpos = realpos ? realpos : fmtpos;
fmtpos++; fmtpos++;
break; break;
case 'X': case 'X':
@ -377,7 +380,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
fmtpar[fmtpos].len = len; fmtpar[fmtpos].len = len;
fmtpar[fmtpos].zpad = zpad; fmtpar[fmtpos].zpad = zpad;
fmtpar[fmtpos].func = FMTNUM_U; fmtpar[fmtpos].func = FMTNUM_U;
fmtpar[fmtpos].realpos = realpos?realpos:fmtpos; fmtpar[fmtpos].realpos = realpos ? realpos : fmtpos;
fmtpos++; fmtpos++;
break; break;
case 's': case 's':
@ -388,14 +391,14 @@ dopr(char *buffer, const char *format, va_list args, char *end)
fmtpar[fmtpos].zpad = zpad; fmtpar[fmtpos].zpad = zpad;
fmtpar[fmtpos].maxwidth = maxwidth; fmtpar[fmtpos].maxwidth = maxwidth;
fmtpar[fmtpos].func = FMTSTR; fmtpar[fmtpos].func = FMTSTR;
fmtpar[fmtpos].realpos = realpos?realpos:fmtpos; fmtpar[fmtpos].realpos = realpos ? realpos : fmtpos;
fmtpos++; fmtpos++;
break; break;
case 'c': case 'c':
fmtpar[fmtpos].fmtbegin = fmtbegin; fmtpar[fmtpos].fmtbegin = fmtbegin;
fmtpar[fmtpos].fmtend = format; fmtpar[fmtpos].fmtend = format;
fmtpar[fmtpos].func = FMTCHAR; fmtpar[fmtpos].func = FMTCHAR;
fmtpar[fmtpos].realpos = realpos?realpos:fmtpos; fmtpar[fmtpos].realpos = realpos ? realpos : fmtpos;
fmtpos++; fmtpos++;
break; break;
case 'e': case 'e':
@ -412,7 +415,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
fmtpar[fmtpos].precision = precision; fmtpar[fmtpos].precision = precision;
fmtpar[fmtpos].pointflag = pointflag; fmtpar[fmtpos].pointflag = pointflag;
fmtpar[fmtpos].func = FMTFLOAT; fmtpar[fmtpos].func = FMTFLOAT;
fmtpar[fmtpos].realpos = realpos?realpos:fmtpos; fmtpar[fmtpos].realpos = realpos ? realpos : fmtpos;
fmtpos++; fmtpos++;
break; break;
case '%': case '%':
@ -429,55 +432,57 @@ dopr(char *buffer, const char *format, va_list args, char *end)
performpr: performpr:
/* reorder pointers */ /* reorder pointers */
for(i = 1; i < fmtpos; i++) for (i = 1; i < fmtpos; i++)
fmtparptr[i] = &fmtpar[fmtpar[i].realpos]; fmtparptr[i] = &fmtpar[fmtpar[i].realpos];
/* assign values */ /* assign values */
for(i = 1; i < fmtpos; i++){ for (i = 1; i < fmtpos; i++)
switch(fmtparptr[i]->func){ {
case FMTSTR: switch (fmtparptr[i]->func)
fmtparptr[i]->value = va_arg(args, char *); {
break; case FMTSTR:
case FMTNUM: fmtparptr[i]->value = va_arg(args, char *);
if (fmtparptr[i]->longflag) break;
{ case FMTNUM:
if (fmtparptr[i]->longlongflag) if (fmtparptr[i]->longflag)
fmtparptr[i]->numvalue = va_arg(args, int64); {
if (fmtparptr[i]->longlongflag)
fmtparptr[i]->numvalue = va_arg(args, int64);
else
fmtparptr[i]->numvalue = va_arg(args, long);
}
else else
fmtparptr[i]->numvalue = va_arg(args, long); fmtparptr[i]->numvalue = va_arg(args, int);
} break;
else case FMTNUM_U:
fmtparptr[i]->numvalue = va_arg(args, int); if (fmtparptr[i]->longflag)
break; {
case FMTNUM_U: if (fmtparptr[i]->longlongflag)
if (fmtparptr[i]->longflag) fmtparptr[i]->numvalue = va_arg(args, uint64);
{ else
if (fmtparptr[i]->longlongflag) fmtparptr[i]->numvalue = va_arg(args, unsigned long);
fmtparptr[i]->numvalue = va_arg(args, uint64); }
else else
fmtparptr[i]->numvalue = va_arg(args, unsigned long); fmtparptr[i]->numvalue = va_arg(args, unsigned int);
} break;
else case FMTFLOAT:
fmtparptr[i]->numvalue = va_arg(args, unsigned int); fmtparptr[i]->fvalue = va_arg(args, double);
break; break;
case FMTFLOAT: case FMTCHAR:
fmtparptr[i]->fvalue = va_arg(args, double); fmtparptr[i]->charvalue = va_arg(args, int);
break; break;
case FMTCHAR: case FMTLEN:
fmtparptr[i]->charvalue = va_arg(args, int); if (i + 1 < fmtpos && fmtparptr[i + 1]->func != FMTWIDTH)
break; fmtparptr[i + 1]->len = va_arg(args, int);
case FMTLEN: /* For "%*.*f", use the second arg */
if (i + 1 < fmtpos && fmtparptr[i + 1]->func != FMTWIDTH) if (i + 2 < fmtpos && fmtparptr[i + 1]->func == FMTWIDTH)
fmtparptr[i + 1]->len = va_arg(args, int); fmtparptr[i + 2]->len = va_arg(args, int);
/* For "%*.*f", use the second arg */ break;
if (i + 2 < fmtpos && fmtparptr[i + 1]->func == FMTWIDTH) case FMTWIDTH:
fmtparptr[i + 2]->len = va_arg(args, int); if (i + 1 < fmtpos)
break; fmtparptr[i + 1]->maxwidth = fmtparptr[i + 1]->precision =
case FMTWIDTH: va_arg(args, int);
if (i + 1 < fmtpos) break;
fmtparptr[i + 1]->maxwidth = fmtparptr[i + 1]->precision =
va_arg(args, int);
break;
} }
} }
@ -486,7 +491,7 @@ performpr:
format = format_save; format = format_save;
while ((ch = *format++)) while ((ch = *format++))
{ {
for(i = 1; i < fmtpos; i++) for (i = 1; i < fmtpos; i++)
{ {
if (ch == '%' && *format == '%') if (ch == '%' && *format == '%')
{ {
@ -495,27 +500,28 @@ performpr:
} }
if (fmtpar[i].fmtbegin == format - 1) if (fmtpar[i].fmtbegin == format - 1)
{ {
switch(fmtparptr[i]->func){ switch (fmtparptr[i]->func)
case FMTSTR: {
fmtstr(fmtparptr[i]->value, fmtparptr[i]->ljust, case FMTSTR:
fmtparptr[i]->len, fmtparptr[i]->zpad, fmtstr(fmtparptr[i]->value, fmtparptr[i]->ljust,
fmtparptr[i]->maxwidth, end, &output); fmtparptr[i]->len, fmtparptr[i]->zpad,
break; fmtparptr[i]->maxwidth, end, &output);
case FMTNUM: break;
case FMTNUM_U: case FMTNUM:
fmtnum(fmtparptr[i]->numvalue, fmtparptr[i]->base, case FMTNUM_U:
fmtparptr[i]->dosign, fmtparptr[i]->ljust, fmtnum(fmtparptr[i]->numvalue, fmtparptr[i]->base,
fmtparptr[i]->dosign, fmtparptr[i]->ljust,
fmtparptr[i]->len, fmtparptr[i]->zpad, end, &output); fmtparptr[i]->len, fmtparptr[i]->zpad, end, &output);
break; break;
case FMTFLOAT: case FMTFLOAT:
fmtfloat(fmtparptr[i]->fvalue, fmtparptr[i]->type, fmtfloat(fmtparptr[i]->fvalue, fmtparptr[i]->type,
fmtparptr[i]->ljust, fmtparptr[i]->len, fmtparptr[i]->ljust, fmtparptr[i]->len,
fmtparptr[i]->precision, fmtparptr[i]->pointflag, fmtparptr[i]->precision, fmtparptr[i]->pointflag,
end, &output); end, &output);
break; break;
case FMTCHAR: case FMTCHAR:
dopr_outch(fmtparptr[i]->charvalue, end, &output); dopr_outch(fmtparptr[i]->charvalue, end, &output);
break; break;
} }
format = fmtpar[i].fmtend; format = fmtpar[i].fmtend;
goto nochar; goto nochar;
@ -523,8 +529,9 @@ performpr:
} }
dopr_outch(ch, end, &output); dopr_outch(ch, end, &output);
nochar: nochar:
/* nothing */ /* nothing */
; /* semicolon required because a goto has to be attached to a statement */ ; /* semicolon required because a goto has to be
* attached to a statement */
} }
*output = '\0'; *output = '\0';
@ -579,8 +586,8 @@ fmtnum(int64 value, int base, int dosign, int ljust, int len, int zpad,
int caps = 0; int caps = 0;
/* /*
* DEBUGP(("value 0x%x, base %d, dosign %d, ljust %d, len %d, zpad * DEBUGP(("value 0x%x, base %d, dosign %d, ljust %d, len %d, zpad %d\n",
* %d\n", value, base, dosign, ljust, len, zpad )); * value, base, dosign, ljust, len, zpad ));
*/ */
uvalue = value; uvalue = value;
if (dosign) if (dosign)