diff --git a/src/config.c b/src/config.c index 05d0257c..016158e1 100644 --- a/src/config.c +++ b/src/config.c @@ -153,9 +153,9 @@ void resetServerSaveParams(void) { server.saveparamslen = 0; } -void queueLoadModule(sds path, sds *argv, int argc) -{ - struct loadmodule *loadmod = zmalloc(sizeof(struct loadmodule)+sizeof(robj*)*argc); +void queueLoadModule(sds path, sds *argv, int argc) { + struct moduleLoadQueueEntry *loadmod = + zmalloc(sizeof(struct moduleLoadQueueEntry)+sizeof(robj*)*argc); int i; loadmod->path = sdsnew(path); diff --git a/src/module.c b/src/module.c index f03c7e8a..e64233b3 100644 --- a/src/module.c +++ b/src/module.c @@ -2897,8 +2897,10 @@ void moduleLoadFromQueue(void) { listRewind(server.loadmodule_queue,&li); while((ln = listNext(&li))) { - struct loadmodule *loadmod = ln->value; - if (moduleLoad(loadmod->path,(void **)loadmod->argv,loadmod->argc) == C_ERR) { + struct moduleLoadQueueEntry *loadmod = ln->value; + if (moduleLoad(loadmod->path,(void **)loadmod->argv,loadmod->argc) + == C_ERR) + { serverLog(LL_WARNING, "Can't load module from %s: server aborting", loadmod->path); diff --git a/src/server.h b/src/server.h index 82bee10a..6dc07d80 100644 --- a/src/server.h +++ b/src/server.h @@ -683,7 +683,7 @@ struct saveparam { int changes; }; -struct loadmodule { +struct moduleLoadQueueEntry { sds path; int argc; robj *argv[];