summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Conway2004-10-13 01:25:13 +0000
committerNeil Conway2004-10-13 01:25:13 +0000
commitba0de24caa01bcef28fb8b84717a5636f71671eb (patch)
tree441576d402dbcf59174819a8593b73f4104a9620
parent5b4ae257084d8311a16234e2ac3c6f77b5ba3275 (diff)
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
-rw-r--r--src/backend/executor/spi.c6
-rw-r--r--src/backend/port/sysv_shmem.c2
-rw-r--r--src/backend/utils/adt/formatting.c8
-rw-r--r--src/backend/utils/mb/mbutils.c2
-rw-r--r--src/backend/utils/mb/wstrcmp.c4
-rw-r--r--src/interfaces/ecpg/preproc/output.c2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 5039f44c65..02aa8e9beb 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -348,7 +348,7 @@ SPI_execp(void *plan, Datum *Values, const char *Nulls, int tcount)
* Passing snapshot == InvalidSnapshot will select the normal behavior of
* fetching a new snapshot for each query.
*/
-extern int
+int
SPI_execute_snapshot(void *plan,
Datum *Values, const char *Nulls,
Snapshot snapshot, Snapshot crosscheck_snapshot,
@@ -1629,13 +1629,13 @@ _SPI_cursor_operation(Portal portal, bool forward, int count,
static MemoryContext
-_SPI_execmem()
+_SPI_execmem(void)
{
return MemoryContextSwitchTo(_SPI_current->execCxt);
}
static MemoryContext
-_SPI_procmem()
+_SPI_procmem(void)
{
return MemoryContextSwitchTo(_SPI_current->procCxt);
}
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index ee0cae8703..6912aebbc8 100644
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -143,7 +143,7 @@ InternalIpcMemoryCreate(IpcMemoryKey memKey, uint32 size)
#ifdef EXEC_BACKEND
memAddress = shmat(shmid, UsedShmemSegAddr, 0);
#else
- memAddress = shmat(shmid, 0, 0);
+ memAddress = shmat(shmid, NULL, 0);
#endif
#endif
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 69fbfebd4e..f6f3272fdc 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -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 9876c84d33..4393da9567 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -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)
diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c
index 055ad7f039..27212ab4bc 100644
--- a/src/interfaces/ecpg/preproc/output.c
+++ b/src/interfaces/ecpg/preproc/output.c
@@ -3,7 +3,7 @@
#include "extern.h"
void
-output_line_number()
+output_line_number(void)
{
if (input_filename)
fprintf(yyout, "\n#line %d \"%s\"\n", yylineno, input_filename);