summaryrefslogtreecommitdiff
path: root/src/backend/utils
diff options
context:
space:
mode:
authorNeil Conway <neilc@samurai.com>2004-10-13 01:25:13 +0000
committerNeil Conway <neilc@samurai.com>2004-10-13 01:25:13 +0000
commit7069dbcc317c287f98e55d5296ff7ca77fadab49 (patch)
treef6fb8476c006cef473c986f8200695bd78f9033b /src/backend/utils
parent1da2bccabbabbebc76af07c0c2276217420cef7d (diff)
downloadpostgresql-7069dbcc317c287f98e55d5296ff7ca77fadab49.tar.gz
More minor cosmetic improvements:
- remove another senseless "extern" keyword that was applied to a function definition - change a foo more function signatures from "some_type foo()" to "some_type foo(void)" - rewrite another K&R style function definition - make the type of the "action" function pointer in the KeyWord struct in src/backend/utils/adt/formatting.c more precise
Diffstat (limited to 'src/backend/utils')
-rw-r--r--src/backend/utils/adt/formatting.c10
-rw-r--r--src/backend/utils/mb/mbutils.c4
-rw-r--r--src/backend/utils/mb/wstrcmp.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 369353e6ce..a982a0071a 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -1,7 +1,7 @@
/* -----------------------------------------------------------------------
* formatting.c
*
- * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.78 2004/08/30 02:54:39 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/adt/formatting.c,v 1.79 2004/10/13 01:25:11 neilc Exp $
*
*
* Portions Copyright (c) 1999-2004, PostgreSQL Global Development Group
@@ -129,23 +129,25 @@ typedef struct
type; /* prefix / postfix */
} KeySuffix;
+typedef struct FormatNode FormatNode;
+
typedef struct
{
char *name; /* keyword */
/* action for keyword */
int len, /* keyword length */
- (*action) (),
+ (*action) (int arg, char *inout, int suf, int flag, FormatNode *node, void *data),
id; /* keyword id */
bool isitdigit; /* is expected output/input digit */
} KeyWord;
-typedef struct
+struct FormatNode
{
int type; /* node type */
KeyWord *key; /* if node type is KEYWORD */
int character, /* if node type is CHAR */
suffix; /* keyword suffix */
-} FormatNode;
+};
#define NODE_TYPE_END 1
#define NODE_TYPE_ACTION 2
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index 1eee1a40dc..9718e7e73e 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -4,7 +4,7 @@
* (currently mule internal code (mic) is used)
* Tatsuo Ishii
*
- * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.47 2004/08/29 05:06:51 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/mb/mbutils.c,v 1.48 2004/10/13 01:25:12 neilc Exp $
*/
#include "postgres.h"
@@ -574,7 +574,7 @@ SetDatabaseEncoding(int encoding)
}
void
-SetDefaultClientEncoding()
+SetDefaultClientEncoding(void)
{
ClientEncoding = &pg_enc2name_tbl[GetDatabaseEncoding()];
}
diff --git a/src/backend/utils/mb/wstrcmp.c b/src/backend/utils/mb/wstrcmp.c
index f828c31a3a..d4e0526f61 100644
--- a/src/backend/utils/mb/wstrcmp.c
+++ b/src/backend/utils/mb/wstrcmp.c
@@ -39,9 +39,7 @@
#include "mb/pg_wchar.h"
int
-pg_char_and_wchar_strcmp(s1, s2)
-register const char *s1;
-register const pg_wchar *s2;
+pg_char_and_wchar_strcmp(const char *s1, const pg_wchar *s2)
{
while ((pg_wchar) *s1 == *s2++)
if (*s1++ == 0)