From 23f08510d5c63a1936bced5a3aaf7ae4860090f9 Mon Sep 17 00:00:00 2001 From: cubicdaiya Date: Sun, 16 Mar 2014 08:51:54 +0900 Subject: [PATCH] Use 'void' for zero-argument functions According to the C standard, it is desirable to give the type 'void' to functions have no argument. Closes #1631 --- src/config.c | 2 +- src/rand.c | 4 ++-- src/redis-check-dump.c | 4 ++-- src/redis-cli.c | 18 +++++++++--------- src/redis.c | 8 ++++---- src/redis.h | 4 ++-- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/config.c b/src/config.c index b0fc50b9..04246fcb 100644 --- a/src/config.c +++ b/src/config.c @@ -73,7 +73,7 @@ void appendServerSaveParams(time_t seconds, int changes) { server.saveparamslen++; } -void resetServerSaveParams() { +void resetServerSaveParams(void) { zfree(server.saveparams); server.saveparams = NULL; server.saveparamslen = 0; diff --git a/src/rand.c b/src/rand.c index 36cb417c..09b0508f 100644 --- a/src/rand.c +++ b/src/rand.c @@ -66,7 +66,7 @@ #define HI_BIT (1L << (2 * N - 1)) static uint32_t x[3] = { X0, X1, X2 }, a[3] = { A0, A1, A2 }, c = C; -static void next(); +static void next(void); int32_t redisLrand48() { next(); @@ -77,7 +77,7 @@ void redisSrand48(int32_t seedval) { SEED(X0, LOW(seedval), HIGH(seedval)); } -static void next() { +static void next(void) { uint32_t p[2], q[2], r[2], carry0, carry1; MUL(a[0], x[0], p); diff --git a/src/redis-check-dump.c b/src/redis-check-dump.c index 185cd243..854e4325 100644 --- a/src/redis-check-dump.c +++ b/src/redis-check-dump.c @@ -168,7 +168,7 @@ int readBytes(void *target, long num) { return 1; } -int processHeader() { +int processHeader(void) { char buf[10] = "_________"; int dump_version; @@ -602,7 +602,7 @@ void printErrorStack(entry *e) { } } -void process() { +void process(void) { uint64_t num_errors = 0, num_valid_ops = 0, num_valid_bytes = 0; entry entry; int dump_version = processHeader(); diff --git a/src/redis-cli.c b/src/redis-cli.c index eafeb190..d892e80c 100644 --- a/src/redis-cli.c +++ b/src/redis-cli.c @@ -98,7 +98,7 @@ static struct config { } config; static volatile sig_atomic_t force_cancel_loop = 0; -static void usage(); +static void usage(void); static void slaveMode(void); char *redisGitSHA1(void); char *redisGitDirty(void); @@ -158,7 +158,7 @@ typedef struct { static helpEntry *helpEntries; static int helpEntriesLen; -static sds cliVersion() { +static sds cliVersion(void) { sds version; version = sdscatprintf(sdsempty(), "%s", REDIS_VERSION); @@ -172,7 +172,7 @@ static sds cliVersion() { return version; } -static void cliInitHelp() { +static void cliInitHelp(void) { int commandslen = sizeof(commandHelp)/sizeof(struct commandHelp); int groupslen = sizeof(commandGroups)/sizeof(char*); int i, len, pos = 0; @@ -211,7 +211,7 @@ static void cliOutputCommandHelp(struct commandHelp *help, int group) { } /* Print generic help. */ -static void cliOutputGenericHelp() { +static void cliOutputGenericHelp(void) { sds version = cliVersion(); printf( "redis-cli %s\r\n" @@ -368,7 +368,7 @@ static int cliConnect(int force) { return REDIS_OK; } -static void cliPrintContextError() { +static void cliPrintContextError(void) { if (context == NULL) return; fprintf(stderr,"Error: %s\n",context->errstr); } @@ -805,7 +805,7 @@ static sds readArgFromStdin(void) { return arg; } -static void usage() { +static void usage(void) { sds version = cliVersion(); fprintf(stderr, "redis-cli %s\n" @@ -874,7 +874,7 @@ static char **convertToSds(int count, char** args) { } #define LINE_BUFLEN 4096 -static void repl() { +static void repl(void) { sds historyfile = NULL; int history = 0; char *line; @@ -1677,7 +1677,7 @@ void bytesToHuman(char *s, long long n) { } } -static void statMode() { +static void statMode(void) { redisReply *reply; long aux, requests = 0; int i = 0; @@ -1763,7 +1763,7 @@ static void statMode() { * Scan mode *--------------------------------------------------------------------------- */ -static void scanMode() { +static void scanMode(void) { redisReply *reply; unsigned long long cur = 0; diff --git a/src/redis.c b/src/redis.c index dff480c0..ff4cbb17 100644 --- a/src/redis.c +++ b/src/redis.c @@ -1376,7 +1376,7 @@ void createSharedObjects(void) { shared.maxstring = createStringObject("maxstring",9); } -void initServerConfig() { +void initServerConfig(void) { int j; getRandomHexChars(server.runid,REDIS_RUN_ID_SIZE); @@ -1696,7 +1696,7 @@ void resetServerStats(void) { server.ops_sec_last_sample_ops = 0; } -void initServer() { +void initServer(void) { int j; signal(SIGHUP, SIG_IGN); @@ -3349,7 +3349,7 @@ void daemonize(void) { } } -void version() { +void version(void) { printf("Redis server v=%s sha=%s:%d malloc=%s bits=%d build=%llx\n", REDIS_VERSION, redisGitSHA1(), @@ -3360,7 +3360,7 @@ void version() { exit(0); } -void usage() { +void usage(void) { fprintf(stderr,"Usage: ./redis-server [/path/to/redis.conf] [options]\n"); fprintf(stderr," ./redis-server - (read config from stdin)\n"); fprintf(stderr," ./redis-server -v or --version\n"); diff --git a/src/redis.h b/src/redis.h index 2cf96028..4d180da2 100644 --- a/src/redis.h +++ b/src/redis.h @@ -1216,7 +1216,7 @@ void redisLog(int level, const char *fmt, ...); #endif void redisLogRaw(int level, const char *msg); void redisLogFromHandler(int level, const char *msg); -void usage(); +void usage(void); void updateDictResizePolicy(void); int htNeedsResize(dict *dict); void oom(const char *msg); @@ -1276,7 +1276,7 @@ sds keyspaceEventsFlagsToString(int flags); /* Configuration */ void loadServerConfig(char *filename, char *options); void appendServerSaveParams(time_t seconds, int changes); -void resetServerSaveParams(); +void resetServerSaveParams(void); struct rewriteConfigState; /* Forward declaration to export API. */ void rewriteConfigRewriteLine(struct rewriteConfigState *state, char *option, sds line, int force); int rewriteConfig(char *path);