sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-17 00:03:56 -04:00
Code Issues Projects Releases Wiki Activity

C code whitespace inprovement for formatting.c.

Browse Source
This commit is contained in:
Bruce Momjian 2006-04-19 14:48:06 +00:00
parent b3e4a84ba5
commit e37a649e94
1 changed files with 1 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/backend/utils/adt/formatting.c
View File

@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
* formatting.c * formatting.c
* *
* $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.108 2006/03/05 15:58:42 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.109 2006/04/19 14:48:06 momjian Exp $
* *
* *
* Portions Copyright (c) 1999-2006, PostgreSQL Global Development Group * Portions Copyright (c) 1999-2006, PostgreSQL Global Development Group
@ -1096,7 +1096,6 @@ NUMDesc_prepare(NUMDesc *num, FormatNode *n)
num->pre_lsign_num = num->pre; num->pre_lsign_num = num->pre;
num->need_locale = TRUE; num->need_locale = TRUE;
num->flag |= NUM_F_LSIGN; num->flag |= NUM_F_LSIGN;
} }
else if (num->lsign == NUM_LSIGN_NONE) else if (num->lsign == NUM_LSIGN_NONE)
{ {
@ -1228,7 +1227,6 @@ parse_format(FormatNode *node, char *str, const KeyWord *kw,
*/ */
if (*str && (n->key = index_seq_search(str, kw, index)) != NULL) if (*str && (n->key = index_seq_search(str, kw, index)) != NULL)
{ {
n->type = NODE_TYPE_ACTION; n->type = NODE_TYPE_ACTION;
n->suffix = 0; n->suffix = 0;
node_set = 1; node_set = 1;
@ -1250,7 +1248,6 @@ parse_format(FormatNode *node, char *str, const KeyWord *kw,
if (s->len) if (s->len)
str += s->len; str += s->len;
} }
} }
else if (*str) else if (*str)
{ {
@ -1259,7 +1256,6 @@ parse_format(FormatNode *node, char *str, const KeyWord *kw,
*/ */
if (*str == '"' && last != '\\') if (*str == '"' && last != '\\')
{ {
int x = 0; int x = 0;
while (*(++str)) while (*(++str))
@ -1284,13 +1280,11 @@ parse_format(FormatNode *node, char *str, const KeyWord *kw,
node_set = 0; node_set = 0;
suffix = 0; suffix = 0;
last = 0; last = 0;
} }
else if (*str && *str == '\\' && last != '\\' && *(str + 1) == '"') else if (*str && *str == '\\' && last != '\\' && *(str + 1) == '"')
{ {
last = *str; last = *str;
str++; str++;
} }
else if (*str) else if (*str)
{ {
@ -1301,7 +1295,6 @@ parse_format(FormatNode *node, char *str, const KeyWord *kw,
last = 0; last = 0;
str++; str++;
} }
} }
/* end */ /* end */
@ -1314,7 +1307,6 @@ parse_format(FormatNode *node, char *str, const KeyWord *kw,
n->suffix = 0; n->suffix = 0;
node_set = 0; node_set = 0;
} }
} }
n->type = NODE_TYPE_END; n->type = NODE_TYPE_END;
@ -1422,7 +1414,6 @@ dump_node(FormatNode *node, int max)
} }
else else
elog(DEBUG_elog_output, "%d:\t unknown NODE!", a); elog(DEBUG_elog_output, "%d:\t unknown NODE!", a);
} }
} }
#endif /* DEBUG */ #endif /* DEBUG */
@ -1558,14 +1549,12 @@ seq_search(char *name, char **array, int type, int max, int *len)
for (last = 0, a = array; *a != NULL; a++) for (last = 0, a = array; *a != NULL; a++)
{ {
/* comperate first chars */ /* comperate first chars */
if (*name != **a) if (*name != **a)
continue; continue;
for (i = 1, p = *a + 1, n = name + 1;; n++, p++, i++) for (i = 1, p = *a + 1, n = name + 1;; n++, p++, i++)
{ {
/* search fragment (max) only */ /* search fragment (max) only */
if (max && i == max) if (max && i == max)
{ {
@ -2703,7 +2692,6 @@ DCH_cache_getnew(char *str)
*/ */
if (n_DCHCache > DCH_CACHE_FIELDS) if (n_DCHCache > DCH_CACHE_FIELDS)
{ {
DCHCacheEntry *old = DCHCache + 0; DCHCacheEntry *old = DCHCache + 0;
#ifdef DEBUG_TO_FROM_CHAR #ifdef DEBUG_TO_FROM_CHAR
@ -3226,7 +3214,6 @@ do_to_timestamp(text *date_txt, text *fmt,
if ((ent = DCH_cache_search(fmt_str)) == NULL) if ((ent = DCH_cache_search(fmt_str)) == NULL)
{ {
ent = DCH_cache_getnew(fmt_str); ent = DCH_cache_getnew(fmt_str);
/* /*
@ -3475,7 +3462,6 @@ NUM_cache_getnew(char *str)
*/ */
if (n_NUMCache > NUM_CACHE_FIELDS) if (n_NUMCache > NUM_CACHE_FIELDS)
{ {
NUMCacheEntry *old = NUMCache + 0; NUMCacheEntry *old = NUMCache + 0;
#ifdef DEBUG_TO_FROM_CHAR #ifdef DEBUG_TO_FROM_CHAR
@ -3503,7 +3489,6 @@ NUM_cache_getnew(char *str)
old->age = (++NUMCounter); old->age = (++NUMCounter);
ent = old; ent = old;
} }
else else
{ {
@ -3598,7 +3583,6 @@ NUM_cache(int len, NUMDesc *Num, char *pars_str, bool *shouldFree)
NULL, NUM_index, NUM_TYPE, Num); NULL, NUM_index, NUM_TYPE, Num);
(format + len)->type = NODE_TYPE_END; /* Paranoia? */ (format + len)->type = NODE_TYPE_END; /* Paranoia? */
} }
else else
{ {
@ -3611,7 +3595,6 @@ NUM_cache(int len, NUMDesc *Num, char *pars_str, bool *shouldFree)
if ((ent = NUM_cache_search(str)) == NULL) if ((ent = NUM_cache_search(str)) == NULL)
{ {
ent = NUM_cache_getnew(str); ent = NUM_cache_getnew(str);
/* /*
@ -3622,7 +3605,6 @@ NUM_cache(int len, NUMDesc *Num, char *pars_str, bool *shouldFree)
NULL, NUM_index, NUM_TYPE, &ent->Num); NULL, NUM_index, NUM_TYPE, &ent->Num);
(ent->format + len)->type = NODE_TYPE_END; /* Paranoia? */ (ent->format + len)->type = NODE_TYPE_END; /* Paranoia? */
} }
format = ent->format; format = ent->format;
@ -3705,7 +3687,6 @@ NUM_prepare_locale(NUMProc *Np)
{ {
if (Np->Num->need_locale) if (Np->Num->need_locale)
{ {
struct lconv *lconv; struct lconv *lconv;
/* /*
@ -3829,7 +3810,6 @@ NUM_numpart_from_char(NUMProc *Np, int id, int plen)
if (*Np->number == ' ' && (id == NUM_0 || id == NUM_9) && if (*Np->number == ' ' && (id == NUM_0 || id == NUM_9) &&
(Np->read_pre + Np->read_post) == 0) (Np->read_pre + Np->read_post) == 0)
{ {
#ifdef DEBUG_TO_FROM_CHAR #ifdef DEBUG_TO_FROM_CHAR
elog(DEBUG_elog_output, "Try read sign (%c), locale positive: %s, negative: %s", elog(DEBUG_elog_output, "Try read sign (%c), locale positive: %s, negative: %s",
*Np->inout_p, Np->L_positive_sign, Np->L_negative_sign); *Np->inout_p, Np->L_positive_sign, Np->L_negative_sign);
@ -3872,14 +3852,11 @@ NUM_numpart_from_char(NUMProc *Np, int id, int plen)
if (*Np->inout_p == '-' || (IS_BRACKET(Np->Num) && if (*Np->inout_p == '-' || (IS_BRACKET(Np->Num) &&
*Np->inout_p == '<')) *Np->inout_p == '<'))
{ {
*Np->number = '-'; /* set - */ *Np->number = '-'; /* set - */
Np->inout_p++; Np->inout_p++;
} }
else if (*Np->inout_p == '+') else if (*Np->inout_p == '+')
{ {
*Np->number = '+'; /* set + */ *Np->number = '+'; /* set + */
Np->inout_p++; Np->inout_p++;
} }
@ -3898,7 +3875,6 @@ NUM_numpart_from_char(NUMProc *Np, int id, int plen)
*/ */
if (isdigit((unsigned char) *Np->inout_p)) if (isdigit((unsigned char) *Np->inout_p))
{ {
if (Np->read_dec && Np->read_post == Np->Num->post) if (Np->read_dec && Np->read_post == Np->Num->post)
return; return;
@ -3922,13 +3898,11 @@ NUM_numpart_from_char(NUMProc *Np, int id, int plen)
} }
else if (IS_DECIMAL(Np->Num) && Np->read_dec == FALSE) else if (IS_DECIMAL(Np->Num) && Np->read_dec == FALSE)
{ {
#ifdef DEBUG_TO_FROM_CHAR #ifdef DEBUG_TO_FROM_CHAR
elog(DEBUG_elog_output, "Try read decimal point (%c)", *Np->inout_p); elog(DEBUG_elog_output, "Try read decimal point (%c)", *Np->inout_p);
#endif #endif
if (*Np->inout_p == '.') if (*Np->inout_p == '.')
{ {
*Np->number_p = '.'; *Np->number_p = '.';
Np->number_p++; Np->number_p++;
Np->read_dec = TRUE; Np->read_dec = TRUE;
@ -4123,7 +4097,6 @@ NUM_numpart_to_char(NUMProc *Np, int id)
*Np->inout_p = ' '; /* Write ' ' */ *Np->inout_p = ' '; /* Write ' ' */
++Np->inout_p; ++Np->inout_p;
} }
} }
else if (IS_ZERO(Np->Num) && else if (IS_ZERO(Np->Num) &&
Np->num_curr < Np->num_pre && Np->num_curr < Np->num_pre &&
@ -4135,7 +4108,6 @@ NUM_numpart_to_char(NUMProc *Np, int id)
*Np->inout_p = '0'; /* Write '0' */ *Np->inout_p = '0'; /* Write '0' */
++Np->inout_p; ++Np->inout_p;
Np->num_in = TRUE; Np->num_in = TRUE;
} }
else else
{ {
@ -4144,7 +4116,6 @@ NUM_numpart_to_char(NUMProc *Np, int id)
*/ */
if (*Np->number_p == '.') if (*Np->number_p == '.')
{ {
if (!Np->last_relevant || *Np->last_relevant != '.') if (!Np->last_relevant || *Np->last_relevant != '.')
{ {
strcpy(Np->inout_p, Np->decimal); /* Write DEC/D */ strcpy(Np->inout_p, Np->decimal); /* Write DEC/D */
@ -4157,11 +4128,9 @@ NUM_numpart_to_char(NUMProc *Np, int id)
else if (IS_FILLMODE(Np->Num) && else if (IS_FILLMODE(Np->Num) &&
Np->last_relevant && *Np->last_relevant == '.') Np->last_relevant && *Np->last_relevant == '.')
{ {
strcpy(Np->inout_p, Np->decimal); /* Write DEC/D */ strcpy(Np->inout_p, Np->decimal); /* Write DEC/D */
Np->inout_p += strlen(Np->inout_p); Np->inout_p += strlen(Np->inout_p);
} }
} }
else else
{ {
@ -4408,7 +4377,6 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
*/ */
switch (n->key->id) switch (n->key->id)
{ {
case NUM_9: case NUM_9:
case NUM_0: case NUM_0:
case NUM_DEC: case NUM_DEC:
@ -4467,7 +4435,6 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
strcpy(Np->inout_p, Np->L_thousands_sep); strcpy(Np->inout_p, Np->L_thousands_sep);
Np->inout_p += strlen(Np->inout_p) - 1; Np->inout_p += strlen(Np->inout_p) - 1;
} }
} }
else else
{ {
@ -4485,7 +4452,6 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
{ {
strcpy(Np->inout_p, Np->L_currency_symbol); strcpy(Np->inout_p, Np->L_currency_symbol);
Np->inout_p += strlen(Np->inout_p) - 1; Np->inout_p += strlen(Np->inout_p) - 1;
} }
else else
Np->inout_p += strlen(Np->L_currency_symbol) - 1; Np->inout_p += strlen(Np->L_currency_symbol) - 1;
@ -4546,7 +4512,6 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
continue; continue;
else else
*Np->inout_p = ' '; *Np->inout_p = ' ';
} }
else else
{ {
@ -4564,7 +4529,6 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
continue; continue;
else else
*Np->inout_p = ' '; *Np->inout_p = ' ';
} }
else else
{ {
@ -4591,7 +4555,6 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
continue; continue;
break; break;
} }
} }
else else
{ {