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

Const-ify the arguments of str_tolower() and friends to suppress compile 

warnings.  Clean up various unneeded cruft that was left behind after
creating those routines.  Introduce some convenience functions str_tolower_z
etc to eliminate tedious and error-prone double arguments in formatting.c.
(Currently there seems no need to export the latter, but maybe reconsider
this later.)
This commit is contained in:
Tom Lane 2008-07-12 00:44:38 +00:00
parent 27cb66fdfe
commit 960af47efd
3 changed files with 66 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
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.144 2008/06/26 16:06:37 teodor Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.145 2008/07/12 00:44:37 tgl Exp $
* *
* *
* Portions Copyright (c) 1999-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1999-2008, PostgreSQL Global Development Group
@ -945,13 +945,6 @@ static NUMCacheEntry *NUM_cache_search(char *str);
static NUMCacheEntry *NUM_cache_getnew(char *str); static NUMCacheEntry *NUM_cache_getnew(char *str);
static void NUM_cache_remove(NUMCacheEntry *ent); static void NUM_cache_remove(NUMCacheEntry *ent);
#ifdef USE_WIDE_UPPER_LOWER
/* externs are in oracle_compat.c */
extern char *wstring_upper(char *str);
extern char *wstring_lower(char *str);
extern wchar_t *texttowcs(const text *txt);
extern text *wcstotext(const wchar_t *str, int ncodes);
#endif
/* ---------- /* ----------
* Fast sequential search, use index for data selection which * Fast sequential search, use index for data selection which
@ -1431,14 +1424,14 @@ str_numth(char *dest, char *num, int type)
* by LC_CTYPE. * by LC_CTYPE.
*/ */
/* ---------- /*
* wide-character-aware lower function * wide-character-aware lower function
*
* We pass the number of bytes so we can pass varlena and char* * We pass the number of bytes so we can pass varlena and char*
* to this function. * to this function. The result is a palloc'd, null-terminated string.
* ----------
*/ */
char * char *
str_tolower(char *buff, size_t nbytes) str_tolower(const char *buff, size_t nbytes)
{ {
char *result; char *result;
@ -1479,14 +1472,14 @@ str_tolower(char *buff, size_t nbytes)
return result; return result;
} }
/* ---------- /*
* wide-character-aware upper function * wide-character-aware upper function
*
* We pass the number of bytes so we can pass varlena and char* * We pass the number of bytes so we can pass varlena and char*
* to this function. * to this function. The result is a palloc'd, null-terminated string.
* ----------
*/ */
char * char *
str_toupper(char *buff, size_t nbytes) str_toupper(const char *buff, size_t nbytes)
{ {
char *result; char *result;
@ -1527,14 +1520,14 @@ str_toupper(char *buff, size_t nbytes)
return result; return result;
} }
/* ---------- /*
* wide-character-aware initcap function * wide-character-aware initcap function
*
* We pass the number of bytes so we can pass varlena and char* * We pass the number of bytes so we can pass varlena and char*
* to this function. * to this function. The result is a palloc'd, null-terminated string.
* ----------
*/ */
char * char *
str_initcap(char *buff, size_t nbytes) str_initcap(const char *buff, size_t nbytes)
{ {
char *result; char *result;
bool wasalnum = false; bool wasalnum = false;
@ -1588,6 +1581,27 @@ str_initcap(char *buff, size_t nbytes)
return result; return result;
} }
/* convenience routines for when the input is null-terminated */
static char *
str_tolower_z(const char *buff)
{
return str_tolower(buff, strlen(buff));
}
static char *
str_toupper_z(const char *buff)
{
return str_toupper(buff, strlen(buff));
}
static char *
str_initcap_z(const char *buff)
{
return str_initcap(buff, strlen(buff));
}
/* ---------- /* ----------
* Sequential search with to upper/lower conversion * Sequential search with to upper/lower conversion
* ---------- * ----------
@ -1791,8 +1805,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
FormatNode *n; FormatNode *n;
char *s; char *s;
struct pg_tm *tm = &in->tm; struct pg_tm *tm = &in->tm;
char buff[DCH_CACHE_SIZE], char buff[DCH_CACHE_SIZE];
workbuff[32];
int i; int i;
/* cache localized days and months */ /* cache localized days and months */
@ -1895,9 +1908,9 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
INVALID_FOR_INTERVAL; INVALID_FOR_INTERVAL;
if (tmtcTzn(in)) if (tmtcTzn(in))
{ {
char *p = pstrdup(tmtcTzn(in)); char *p = str_tolower_z(tmtcTzn(in));
strcpy(s, str_tolower(p, strlen(p))); strcpy(s, p);
pfree(p); pfree(p);
s += strlen(s); s += strlen(s);
} }
@ -1939,14 +1952,10 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
if (!tm->tm_mon) if (!tm->tm_mon)
break; break;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_toupper(localized_full_months[tm->tm_mon - 1], strcpy(s, str_toupper_z(localized_full_months[tm->tm_mon - 1]));
strlen(localized_full_months[tm->tm_mon - 1])));
else else
{
strcpy(workbuff, months_full[tm->tm_mon - 1]);
sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9,
str_toupper(workbuff, strlen(workbuff))); str_toupper_z(months_full[tm->tm_mon - 1]));
}
s += strlen(s); s += strlen(s);
break; break;
case DCH_Month: case DCH_Month:
@ -1954,8 +1963,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
if (!tm->tm_mon) if (!tm->tm_mon)
break; break;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_initcap(localized_full_months[tm->tm_mon - 1], strcpy(s, str_initcap_z(localized_full_months[tm->tm_mon - 1]));
strlen(localized_full_months[tm->tm_mon - 1])));
else else
sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, months_full[tm->tm_mon - 1]); sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, months_full[tm->tm_mon - 1]);
s += strlen(s); s += strlen(s);
@ -1965,8 +1973,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
if (!tm->tm_mon) if (!tm->tm_mon)
break; break;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_tolower(localized_full_months[tm->tm_mon - 1], strcpy(s, str_tolower_z(localized_full_months[tm->tm_mon - 1]));
strlen(localized_full_months[tm->tm_mon - 1])));
else else
{ {
sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, months_full[tm->tm_mon - 1]); sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, months_full[tm->tm_mon - 1]);
@ -1979,11 +1986,9 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
if (!tm->tm_mon) if (!tm->tm_mon)
break; break;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_toupper(localized_abbrev_months[tm->tm_mon - 1], strcpy(s, str_toupper_z(localized_abbrev_months[tm->tm_mon - 1]));
strlen(localized_abbrev_months[tm->tm_mon - 1])));
else else
strcpy(s, str_toupper(months[tm->tm_mon - 1], strcpy(s, str_toupper_z(months[tm->tm_mon - 1]));
strlen(months[tm->tm_mon - 1])));
s += strlen(s); s += strlen(s);
break; break;
case DCH_Mon: case DCH_Mon:
@ -1991,8 +1996,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
if (!tm->tm_mon) if (!tm->tm_mon)
break; break;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_initcap(localized_abbrev_months[tm->tm_mon - 1], strcpy(s, str_initcap_z(localized_abbrev_months[tm->tm_mon - 1]));
strlen(localized_abbrev_months[tm->tm_mon - 1])));
else else
strcpy(s, months[tm->tm_mon - 1]); strcpy(s, months[tm->tm_mon - 1]);
s += strlen(s); s += strlen(s);
@ -2002,8 +2006,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
if (!tm->tm_mon) if (!tm->tm_mon)
break; break;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_tolower(localized_abbrev_months[tm->tm_mon - 1], strcpy(s, str_tolower_z(localized_abbrev_months[tm->tm_mon - 1]));
strlen(localized_abbrev_months[tm->tm_mon - 1])));
else else
{ {
strcpy(s, months[tm->tm_mon - 1]); strcpy(s, months[tm->tm_mon - 1]);
@ -2020,21 +2023,16 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
case DCH_DAY: case DCH_DAY:
INVALID_FOR_INTERVAL; INVALID_FOR_INTERVAL;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_toupper(localized_full_days[tm->tm_wday], strcpy(s, str_toupper_z(localized_full_days[tm->tm_wday]));
strlen(localized_full_days[tm->tm_wday])));
else else
{
strcpy(workbuff, days[tm->tm_wday]);
sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9,
str_toupper(workbuff, strlen(workbuff))); str_toupper_z(days[tm->tm_wday]));
}
s += strlen(s); s += strlen(s);
break; break;
case DCH_Day: case DCH_Day:
INVALID_FOR_INTERVAL; INVALID_FOR_INTERVAL;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_initcap(localized_full_days[tm->tm_wday], strcpy(s, str_initcap_z(localized_full_days[tm->tm_wday]));
strlen(localized_full_days[tm->tm_wday])));
else else
sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, days[tm->tm_wday]); sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, days[tm->tm_wday]);
s += strlen(s); s += strlen(s);
@ -2042,8 +2040,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
case DCH_day: case DCH_day:
INVALID_FOR_INTERVAL; INVALID_FOR_INTERVAL;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_tolower(localized_full_days[tm->tm_wday], strcpy(s, str_tolower_z(localized_full_days[tm->tm_wday]));
strlen(localized_full_days[tm->tm_wday])));
else else
{ {
sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, days[tm->tm_wday]); sprintf(s, "%*s", S_FM(n->suffix) ? 0 : -9, days[tm->tm_wday]);
@ -2054,18 +2051,15 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
case DCH_DY: case DCH_DY:
INVALID_FOR_INTERVAL; INVALID_FOR_INTERVAL;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_toupper(localized_abbrev_days[tm->tm_wday], strcpy(s, str_toupper_z(localized_abbrev_days[tm->tm_wday]));
strlen(localized_abbrev_days[tm->tm_wday])));
else else
strcpy(s, str_toupper(days_short[tm->tm_wday], strcpy(s, str_toupper_z(days_short[tm->tm_wday]));
strlen(days_short[tm->tm_wday])));
s += strlen(s); s += strlen(s);
break; break;
case DCH_Dy: case DCH_Dy:
INVALID_FOR_INTERVAL; INVALID_FOR_INTERVAL;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_initcap(localized_abbrev_days[tm->tm_wday], strcpy(s, str_initcap_z(localized_abbrev_days[tm->tm_wday]));
strlen(localized_abbrev_days[tm->tm_wday])));
else else
strcpy(s, days_short[tm->tm_wday]); strcpy(s, days_short[tm->tm_wday]);
s += strlen(s); s += strlen(s);
@ -2073,8 +2067,7 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out)
case DCH_dy: case DCH_dy:
INVALID_FOR_INTERVAL; INVALID_FOR_INTERVAL;
if (S_TM(n->suffix)) if (S_TM(n->suffix))
strcpy(s, str_tolower(localized_abbrev_days[tm->tm_wday], strcpy(s, str_tolower_z(localized_abbrev_days[tm->tm_wday]));
strlen(localized_abbrev_days[tm->tm_wday])));
else else
{ {
strcpy(s, days_short[tm->tm_wday]); strcpy(s, days_short[tm->tm_wday]);
@ -4339,14 +4332,12 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout, char *number,
case NUM_rn: case NUM_rn:
if (IS_FILLMODE(Np->Num)) if (IS_FILLMODE(Np->Num))
{ {
strcpy(Np->inout_p, str_tolower(Np->number_p, strcpy(Np->inout_p, str_tolower_z(Np->number_p));
strlen(Np->number_p)));
Np->inout_p += strlen(Np->inout_p) - 1; Np->inout_p += strlen(Np->inout_p) - 1;
} }
else else
{ {
sprintf(Np->inout_p, "%15s", str_tolower(Np->number_p, sprintf(Np->inout_p, "%15s", str_tolower_z(Np->number_p));
strlen(Np->number_p)));
Np->inout_p += strlen(Np->inout_p) - 1; Np->inout_p += strlen(Np->inout_p) - 1;
} }
break; break;

25
src/backend/utils/adt/oracle_compat.c
View File

@ -9,28 +9,14 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.81 2008/06/23 19:27:19 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.82 2008/07/12 00:44:37 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
#include "postgres.h" #include "postgres.h"
#include <ctype.h>
#include <limits.h>
/*
* towlower() and friends should be in <wctype.h>, but some pre-C99 systems
* declare them in <wchar.h>.
*/
#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
#ifdef HAVE_WCTYPE_H
#include <wctype.h>
#endif
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/formatting.h" #include "utils/formatting.h"
#include "utils/pg_locale.h"
#include "mb/pg_wchar.h" #include "mb/pg_wchar.h"
@ -60,7 +46,8 @@ lower(PG_FUNCTION_ARGS)
char *out_string; char *out_string;
text *result; text *result;
out_string = str_tolower(VARDATA_ANY(in_string), VARSIZE_ANY_EXHDR(in_string)); out_string = str_tolower(VARDATA_ANY(in_string),
VARSIZE_ANY_EXHDR(in_string));
result = cstring_to_text(out_string); result = cstring_to_text(out_string);
pfree(out_string); pfree(out_string);
@ -89,7 +76,8 @@ upper(PG_FUNCTION_ARGS)
char *out_string; char *out_string;
text *result; text *result;
out_string = str_toupper(VARDATA_ANY(in_string), VARSIZE_ANY_EXHDR(in_string)); out_string = str_toupper(VARDATA_ANY(in_string),
VARSIZE_ANY_EXHDR(in_string));
result = cstring_to_text(out_string); result = cstring_to_text(out_string);
pfree(out_string); pfree(out_string);
@ -121,7 +109,8 @@ initcap(PG_FUNCTION_ARGS)
char *out_string; char *out_string;
text *result; text *result;
out_string = str_initcap(VARDATA_ANY(in_string), VARSIZE_ANY_EXHDR(in_string)); out_string = str_initcap(VARDATA_ANY(in_string),
VARSIZE_ANY_EXHDR(in_string));
result = cstring_to_text(out_string); result = cstring_to_text(out_string);
pfree(out_string); pfree(out_string);

8
src/include/utils/formatting.h
View File

@ -2,7 +2,7 @@
/* ----------------------------------------------------------------------- /* -----------------------------------------------------------------------
* formatting.h * formatting.h
* *
* $PostgreSQL: pgsql/src/include/utils/formatting.h,v 1.19 2008/06/23 19:27:19 momjian Exp $ * $PostgreSQL: pgsql/src/include/utils/formatting.h,v 1.20 2008/07/12 00:44:38 tgl Exp $
* *
* *
* Portions Copyright (c) 1999-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1999-2008, PostgreSQL Global Development Group
@ -21,9 +21,9 @@
#include "fmgr.h" #include "fmgr.h"
extern char *str_tolower(char *buff, size_t nbytes); extern char *str_tolower(const char *buff, size_t nbytes);
extern char *str_toupper(char *buff, size_t nbytes); extern char *str_toupper(const char *buff, size_t nbytes);
extern char *str_initcap(char *buff, size_t nbytes); extern char *str_initcap(const char *buff, size_t nbytes);
extern Datum timestamp_to_char(PG_FUNCTION_ARGS); extern Datum timestamp_to_char(PG_FUNCTION_ARGS);
extern Datum timestamptz_to_char(PG_FUNCTION_ARGS); extern Datum timestamptz_to_char(PG_FUNCTION_ARGS);