From f1283ed6cc4db5df781452b5f048dc930cc6a172 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 25 Oct 2004 02:15:02 +0000
Subject: [PATCH] Fix a bunch of 'old-style parameter declaration' warnings
induced by writing 'foo()' rather than 'foo(void)'.
---
contrib/miscutil/misc_utils.c | 2 +-
contrib/pg_autovacuum/pg_autovacuum.c | 12 ++++++------
contrib/pg_dumplo/main.c | 4 ++--
contrib/pgbench/pgbench.c | 6 +++---
contrib/pgcrypto/crypt-des.c | 2 +-
contrib/pgcrypto/internal.c | 10 +++++-----
contrib/tsearch/dict/porter_english.dct | 14 +++++++++-----
7 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/contrib/miscutil/misc_utils.c b/contrib/miscutil/misc_utils.c
index ce8776fa3cb..cb0f4b8833d 100644
--- a/contrib/miscutil/misc_utils.c
+++ b/contrib/miscutil/misc_utils.c
@@ -32,7 +32,7 @@
int
-backend_pid()
+backend_pid(void)
{
return getpid();
}
diff --git a/contrib/pg_autovacuum/pg_autovacuum.c b/contrib/pg_autovacuum/pg_autovacuum.c
index 43a8c98c795..4ed30604f9f 100644
--- a/contrib/pg_autovacuum/pg_autovacuum.c
+++ b/contrib/pg_autovacuum/pg_autovacuum.c
@@ -4,7 +4,7 @@
* Revisions by Christopher B. Browne, Liberty RMS
* Win32 Service code added by Dave Page
*
- * $PostgreSQL: pgsql/contrib/pg_autovacuum/pg_autovacuum.c,v 1.22 2004/10/16 21:50:02 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pg_autovacuum/pg_autovacuum.c,v 1.23 2004/10/25 02:14:59 tgl Exp $
*/
#include "postgres_fe.h"
@@ -192,7 +192,7 @@ log_entry(const char *logentry, int level)
*/
#ifndef WIN32
static void
-daemonize()
+daemonize(void)
{
pid_t pid;
@@ -552,7 +552,7 @@ print_table_info(tbl_info * tbl)
/* init_db_list() creates the db_list and initalizes template1 */
static Dllist *
-init_db_list()
+init_db_list(void)
{
Dllist *db_list = DLNewList();
db_info *dbs = NULL;
@@ -975,7 +975,7 @@ send_query(const char *query, db_info * dbi)
static void
-free_cmd_args()
+free_cmd_args(void)
{
if (args != NULL)
{
@@ -1109,7 +1109,7 @@ get_cmd_args(int argc, char *argv[])
}
static void
-usage()
+usage(void)
{
int i = 0;
float f = 0;
@@ -1151,7 +1151,7 @@ usage()
}
static void
-print_cmd_args()
+print_cmd_args(void)
{
sprintf(logbuffer, "Printing command_args");
log_entry(logbuffer, LVL_INFO);
diff --git a/contrib/pg_dumplo/main.c b/contrib/pg_dumplo/main.c
index e8608312e5f..1f092743141 100644
--- a/contrib/pg_dumplo/main.c
+++ b/contrib/pg_dumplo/main.c
@@ -1,7 +1,7 @@
/* -------------------------------------------------------------------------
* pg_dumplo
*
- * $PostgreSQL: pgsql/contrib/pg_dumplo/main.c,v 1.19 2003/11/29 19:51:35 pgsql Exp $
+ * $PostgreSQL: pgsql/contrib/pg_dumplo/main.c,v 1.20 2004/10/25 02:15:00 tgl Exp $
*
* Karel Zak 1999-2000
* -------------------------------------------------------------------------
@@ -264,7 +264,7 @@ parse_lolist(LODumpMaster * pgLO)
static void
-usage()
+usage(void)
{
printf("\npg_dumplo %s - PostgreSQL large objects dump\n", PG_VERSION);
puts("pg_dumplo [option]\n\n"
diff --git a/contrib/pgbench/pgbench.c b/contrib/pgbench/pgbench.c
index 4dbf0d3fcfa..06952a0d7a1 100644
--- a/contrib/pgbench/pgbench.c
+++ b/contrib/pgbench/pgbench.c
@@ -1,5 +1,5 @@
/*
- * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.33 2004/09/14 03:39:23 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgbench/pgbench.c,v 1.34 2004/10/25 02:15:01 tgl Exp $
*
* pgbench: a simple TPC-B like benchmark program for PostgreSQL
* written by Tatsuo Ishii
@@ -107,7 +107,7 @@ typedef struct
} CState;
static void
-usage()
+usage(void)
{
fprintf(stderr, "usage: pgbench [-h hostname][-p port][-c nclients][-t ntransactions][-s scaling_factor][-n][-C][-v][-S][-N][-l][-U login][-P password][-d][dbname]\n");
fprintf(stderr, "(initialize mode): pgbench -i [-h hostname][-p port][-s scaling_factor][-U login][-P password][-d][dbname]\n");
@@ -122,7 +122,7 @@ getrand(int min, int max)
/* set up a connection to the backend */
static PGconn *
-doConnect()
+doConnect(void)
{
PGconn *con;
PGresult *res;
diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c
index 8be5640b473..0edff299a05 100644
--- a/contrib/pgcrypto/crypt-des.c
+++ b/contrib/pgcrypto/crypt-des.c
@@ -216,7 +216,7 @@ ascii_to_bin(char ch)
}
static void
-des_init()
+des_init(void)
{
int i,
j,
diff --git a/contrib/pgcrypto/internal.c b/contrib/pgcrypto/internal.c
index db7b46da067..c95a4e957a6 100644
--- a/contrib/pgcrypto/internal.c
+++ b/contrib/pgcrypto/internal.c
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $PostgreSQL: pgsql/contrib/pgcrypto/internal.c,v 1.13 2004/05/07 00:24:57 tgl Exp $
+ * $PostgreSQL: pgsql/contrib/pgcrypto/internal.c,v 1.14 2004/10/25 02:15:02 tgl Exp $
*/
@@ -493,25 +493,25 @@ bf_load(int mode)
/* ciphers */
static PX_Cipher *
-rj_128_ecb()
+rj_128_ecb(void)
{
return rj_load(MODE_ECB);
}
static PX_Cipher *
-rj_128_cbc()
+rj_128_cbc(void)
{
return rj_load(MODE_CBC);
}
static PX_Cipher *
-bf_ecb_load()
+bf_ecb_load(void)
{
return bf_load(MODE_ECB);
}
static PX_Cipher *
-bf_cbc_load()
+bf_cbc_load(void)
{
return bf_load(MODE_CBC);
}
diff --git a/contrib/tsearch/dict/porter_english.dct b/contrib/tsearch/dict/porter_english.dct
index 5158a9b8762..6c472298284 100644
--- a/contrib/tsearch/dict/porter_english.dct
+++ b/contrib/tsearch/dict/porter_english.dct
@@ -24,7 +24,7 @@
#ifdef DICT_BODY
#include <ctype.h> /* tolower */
-static void * setup_english_stemmer();
+static void * setup_english_stemmer(void);
static const char * english_stem(void * z, const char * q, int i0, int i1);
@@ -1233,11 +1233,13 @@ find_english_stopword( unsigned char *buf, int len ) {
#undef ISFINISH
static int
-is_stopengword(void* obj,char* word,int len) {
+is_stopengword(void* obj,char* word,int len)
+{
return ( len == find_english_stopword((unsigned char*)word, len) ) ? 1 : 0;
}
-static void * setup_english_stemmer()
+static void *
+setup_english_stemmer(void)
{
struct english_stemmer * z = (struct english_stemmer *) malloc(sizeof(struct english_stemmer));
z->p = 0; z->p_size = 0;
@@ -1245,7 +1247,8 @@ static void * setup_english_stemmer()
return (void *) z;
}
-static void closedown_english_stemmer(void * z_)
+static void
+closedown_english_stemmer(void * z_)
{
struct english_stemmer * z = (struct english_stemmer *) z_;
free_pool(z->irregulars);
@@ -1254,7 +1257,8 @@ static void closedown_english_stemmer(void * z_)
}
static char*
-engstemming(void* obj, char *word, int *len) {
+engstemming(void* obj, char *word, int *len)
+{
struct english_stemmer * z = (struct english_stemmer *) obj;
const char* stemmed_word;
char *result = word;
--
GitLab