From 5e3be1be09c947810732e7be2a4bb1b0ed75de4a Mon Sep 17 00:00:00 2001 From: Madelyn Olson <34459052+madolson@users.noreply.github.com> Date: Tue, 2 May 2023 17:31:32 -0700 Subject: Remove prototypes with empty declarations (#12020) Technically declaring a prototype with an empty declaration has been deprecated since the early days of C, but we never got a warning for it. C2x will apparently be introducing a breaking change if you are using this type of declarator, so Clang 15 has started issuing a warning with -pedantic. Although not apparently a problem for any of the compiler we build on, if feels like the right thing is to properly adhere to the C standard and use (void). --- src/server.h | 69 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 35 deletions(-) (limited to 'src/server.h') diff --git a/src/server.h b/src/server.h index 222044ab9..bced3dbb8 100644 --- a/src/server.h +++ b/src/server.h @@ -1372,9 +1372,8 @@ typedef struct redisOp { /* Defines an array of Redis operations. There is an API to add to this * structure in an easy way. * - * redisOpArrayInit(); - * redisOpArrayAppend(); - * redisOpArrayFree(); + * int redisOpArrayAppend(redisOpArray *oa, int dbid, robj **argv, int argc, int target); + * void redisOpArrayFree(redisOpArray *oa); */ typedef struct redisOpArray { redisOp *ops; @@ -2472,14 +2471,14 @@ void moduleAcquireGIL(void); int moduleTryAcquireGIL(void); void moduleReleaseGIL(void); void moduleNotifyKeyspaceEvent(int type, const char *event, robj *key, int dbid); -void firePostExecutionUnitJobs(); +void firePostExecutionUnitJobs(void); void moduleCallCommandFilters(client *c); -void modulePostExecutionUnitOperations(); +void modulePostExecutionUnitOperations(void); void ModuleForkDoneHandler(int exitcode, int bysignal); int TerminateModuleForkChild(int child_pid, int wait); ssize_t rdbSaveModulesAux(rio *rdb, int when); -int moduleAllDatatypesHandleErrors(); -int moduleAllModulesHandleReplAsyncLoad(); +int moduleAllDatatypesHandleErrors(void); +int moduleAllModulesHandleReplAsyncLoad(void); sds modulesCollectInfo(sds info, dict *sections_dict, int for_crash_report, int sections); void moduleFireServerEvent(uint64_t eid, int subid, void *data); void processModuleLoadingProgressEvent(int is_aof); @@ -2607,11 +2606,11 @@ void unpauseActions(pause_purpose purpose); uint32_t isPausedActions(uint32_t action_bitmask); uint32_t isPausedActionsWithUpdate(uint32_t action_bitmask); void updatePausedActions(void); -void unblockPostponedClients(); +void unblockPostponedClients(void); void processEventsWhileBlocked(void); -void whileBlockedCron(); -void blockingOperationStarts(); -void blockingOperationEnds(); +void whileBlockedCron(void); +void blockingOperationStarts(void); +void blockingOperationEnds(void); int handleClientsWithPendingWrites(void); int handleClientsWithPendingWritesUsingThreads(void); int handleClientsWithPendingReadsUsingThreads(void); @@ -2777,7 +2776,7 @@ void replicationCron(void); void replicationStartPendingFork(void); void replicationHandleMasterDisconnection(void); void replicationCacheMaster(client *c); -void resizeReplicationBacklog(); +void resizeReplicationBacklog(void); void replicationSetMaster(char *ip, int port); void replicationUnsetMaster(void); void refreshGoodSlavesCount(void); @@ -2806,7 +2805,7 @@ void rdbPipeWriteHandlerConnRemoved(struct connection *conn); void clearFailoverState(void); void updateFailoverStatus(void); void abortFailover(const char *err); -const char *getFailoverStateString(); +const char *getFailoverStateString(void); /* Generic persistence functions */ void startLoadingFile(size_t size, char* filename, int rdbflags); @@ -2840,7 +2839,7 @@ void stopAppendOnly(void); int startAppendOnly(void); void backgroundRewriteDoneHandler(int exitcode, int bysignal); void killAppendOnlyChild(void); -void restartAOFAfterSYNC(); +void restartAOFAfterSYNC(void); void aofLoadManifestFromDisk(void); void aofOpenIfNeededOnServerStart(void); void aofManifestFree(aofManifest *am); @@ -2857,8 +2856,8 @@ void receiveChildInfo(void); /* Fork helpers */ int redisFork(int purpose); -int hasActiveChildProcess(); -void resetChildState(); +int hasActiveChildProcess(void); +void resetChildState(void); int isMutuallyExclusiveChildType(int type); /* acl.c -- Authentication related prototypes. */ @@ -2912,13 +2911,13 @@ int ACLLoadConfiguredUsers(void); robj *ACLDescribeUser(user *u); void ACLLoadUsersAtStartup(void); void addReplyCommandCategories(client *c, struct redisCommand *cmd); -user *ACLCreateUnlinkedUser(); +user *ACLCreateUnlinkedUser(void); void ACLFreeUserAndKillClients(user *u); void addACLLogEntry(client *c, int reason, int context, int argpos, sds username, sds object); sds getAclErrorMessage(int acl_res, user *user, struct redisCommand *cmd, sds errored_val, int verbose); void ACLUpdateDefaultUserPassword(sds password); sds genRedisInfoStringACLStats(sds info); -void ACLRecomputeCommandBitsFromCommandRulesAllUsers(); +void ACLRecomputeCommandBitsFromCommandRulesAllUsers(void); /* Sorted sets data type */ @@ -2990,7 +2989,7 @@ int zslLexValueLteMax(sds value, zlexrangespec *spec); /* Core functions */ int getMaxmemoryState(size_t *total, size_t *logical, size_t *tofree, float *level); -size_t freeMemoryGetNotCountedMemory(); +size_t freeMemoryGetNotCountedMemory(void); int overMaxmemoryAfterAlloc(size_t moremem); uint64_t getCommandFlags(client *c); int processCommand(client *c); @@ -3011,11 +3010,11 @@ struct redisCommand *lookupCommandByCString(const char *s); struct redisCommand *lookupCommandOrOriginal(robj **argv, int argc); int commandCheckExistence(client *c, sds *err); int commandCheckArity(client *c, sds *err); -void startCommandExecution(); +void startCommandExecution(void); int incrCommandStatsOnError(struct redisCommand *cmd, int flags); void call(client *c, int flags); void alsoPropagate(int dbid, robj **argv, int argc, int target); -void postExecutionUnitOperations(); +void postExecutionUnitOperations(void); void redisOpArrayFree(redisOpArray *oa); void forceCommandPropagation(client *c, int flags); void preventCommandPropagation(client *c); @@ -3047,7 +3046,7 @@ void incrementErrorCount(const char *fullerr, size_t namelen); void closeListeningSockets(int unlink_unix_socket); void updateCachedTime(int update_daylight_info); void enterExecutionUnit(int update_cached_time, long long us); -void exitExecutionUnit(); +void exitExecutionUnit(void); void resetServerStats(void); void activeDefragCycle(void); unsigned int getLRUClock(void); @@ -3121,8 +3120,8 @@ int pubsubUnsubscribeAllPatterns(client *c, int notify); int pubsubPublishMessage(robj *channel, robj *message, int sharded); int pubsubPublishMessageAndPropagateToCluster(robj *channel, robj *message, int sharded); void addReplyPubsubMessage(client *c, robj *channel, robj *msg, robj *message_bulk); -int serverPubsubSubscriptionCount(); -int serverPubsubShardSubscriptionCount(); +int serverPubsubSubscriptionCount(void); +int serverPubsubShardSubscriptionCount(void); size_t pubsubMemOverhead(client *c); /* Keyspace events notification */ @@ -3176,12 +3175,12 @@ struct rewriteConfigState; /* Forward declaration to export API. */ int rewriteConfigRewriteLine(struct rewriteConfigState *state, const char *option, sds line, int force); void rewriteConfigMarkAsProcessed(struct rewriteConfigState *state, const char *option); int rewriteConfig(char *path, int force_write); -void initConfigValues(); +void initConfigValues(void); void removeConfig(sds name); -sds getConfigDebugInfo(); +sds getConfigDebugInfo(void); int allowProtectedAction(int config, client *c); -void initServerClientMemUsageBuckets(); -void freeServerClientMemUsageBuckets(); +void initServerClientMemUsageBuckets(void); +void freeServerClientMemUsageBuckets(void); /* Module Configuration */ typedef struct ModuleConfig ModuleConfig; @@ -3249,7 +3248,7 @@ robj *dbUnshareStringValue(redisDb *db, robj *key, robj *o); long long emptyData(int dbnum, int flags, void(callback)(dict*)); long long emptyDbStructure(redisDb *dbarray, int dbnum, int async, void(callback)(dict*)); void flushAllDataAndResetRDB(int flags); -long long dbTotalServerKeyCount(); +long long dbTotalServerKeyCount(void); redisDb *initTempDb(void); void discardTempDb(redisDb *tempDb, void(callback)(dict*)); @@ -3326,16 +3325,16 @@ sds luaCreateFunction(client *c, robj *body); void luaLdbLineHook(lua_State *lua, lua_Debug *ar); void freeLuaScriptsAsync(dict *lua_scripts); void freeFunctionsAsync(functionsLibCtx *lib_ctx); -int ldbIsEnabled(); +int ldbIsEnabled(void); void ldbLog(sds entry); void ldbLogRedisReply(char *reply); void sha1hex(char *digest, char *script, size_t len); -unsigned long evalMemory(); -dict* evalScriptsDict(); -unsigned long evalScriptsMemory(); +unsigned long evalMemory(void); +dict* evalScriptsDict(void); +unsigned long evalScriptsMemory(void); uint64_t evalGetCommandFlags(client *c, uint64_t orig_flags); uint64_t fcallGetCommandFlags(client *c, uint64_t orig_flags); -int isInsideYieldingLongCommand(); +int isInsideYieldingLongCommand(void); typedef struct luaScript { uint64_t flags; @@ -3691,7 +3690,7 @@ dict *genInfoSectionDict(robj **argv, int argc, char **defaults, int *out_all, i void releaseInfoSectionDict(dict *sec); sds genRedisInfoString(dict *section_dict, int all_sections, int everything); sds genModulesInfoString(sds info); -void applyWatchdogPeriod(); +void applyWatchdogPeriod(void); void watchdogScheduleSignal(int period); void serverLogHexDump(int level, char *descr, void *value, size_t len); int memtest_preserving_test(unsigned long *m, size_t bytes, int passes); -- cgit v1.2.1