Skip to content

P
Postgres FD Implementation
Commit ca667973 authored by Bruce Momjian's avatar Bruce Momjian
Browse files
Options

pgindent snprintf.c for consistency.

parent 2306f63d
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 134 deletions
src/port/snprintf.c
View file @ ca667973
...@@ -65,11 +65,11 @@ ...@@ -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 */
...@@ -82,6 +82,7 @@ int ...@@ -82,6 +82,7 @@ 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,...) ...@@ -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,...) ...@@ -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;
} }
...@@ -169,8 +170,8 @@ dopr(char *buffer, const char *format, va_list args, char *end) ...@@ -169,8 +170,8 @@ 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;
...@@ -178,10 +179,11 @@ dopr(char *buffer, const char *format, va_list args, char *end) ...@@ -178,10 +179,11 @@ dopr(char *buffer, const char *format, va_list args, char *end)
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;
void *value;
int64 numvalue; int64 numvalue;
double fvalue; double fvalue;
int charvalue; int charvalue;
...@@ -275,7 +277,7 @@ dopr(char *buffer, const char *format, va_list args, char *end) ...@@ -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,6 +290,7 @@ dopr(char *buffer, const char *format, va_list args, char *end) ...@@ -288,6 +290,7 @@ 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 * We might export this to client apps so we should
* support 'qd' and 'I64d'(MinGW) also in case the * support 'qd' and 'I64d'(MinGW) also in case the
...@@ -298,7 +301,7 @@ dopr(char *buffer, const char *format, va_list args, char *end) ...@@ -298,7 +301,7 @@ dopr(char *buffer, const char *format, va_list args, char *end)
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) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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,12 +432,14 @@ dopr(char *buffer, const char *format, va_list args, char *end) ...@@ -429,12 +432,14 @@ 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){ {
switch (fmtparptr[i]->func)
{
case FMTSTR: case FMTSTR:
fmtparptr[i]->value = va_arg(args, char *); fmtparptr[i]->value = va_arg(args, char *);
break; break;
...@@ -486,7 +491,7 @@ performpr: ...@@ -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,7 +500,8 @@ performpr: ...@@ -495,7 +500,8 @@ performpr:
} }
if (fmtpar[i].fmtbegin == format - 1) if (fmtpar[i].fmtbegin == format - 1)
{ {
switch(fmtparptr[i]->func){ switch (fmtparptr[i]->func)
{
case FMTSTR: case FMTSTR:
fmtstr(fmtparptr[i]->value, fmtparptr[i]->ljust, fmtstr(fmtparptr[i]->value, fmtparptr[i]->ljust,
fmtparptr[i]->len, fmtparptr[i]->zpad, fmtparptr[i]->len, fmtparptr[i]->zpad,
...@@ -524,7 +530,8 @@ performpr: ...@@ -524,7 +530,8 @@ 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, ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment