Commit 1ad5c227 authored by antirez's avatar antirez
Browse files

Minor changes to unifor C style to Redis code base for PR #3293.

parent e8d5387a
...@@ -153,9 +153,9 @@ void resetServerSaveParams(void) { ...@@ -153,9 +153,9 @@ void resetServerSaveParams(void) {
server.saveparamslen = 0; server.saveparamslen = 0;
} }
void queueLoadModule(sds path, sds *argv, int argc) void queueLoadModule(sds path, sds *argv, int argc) {
{ struct moduleLoadQueueEntry *loadmod =
struct loadmodule *loadmod = zmalloc(sizeof(struct loadmodule)+sizeof(robj*)*argc); zmalloc(sizeof(struct moduleLoadQueueEntry)+sizeof(robj*)*argc);
int i; int i;
loadmod->path = sdsnew(path); loadmod->path = sdsnew(path);
......
...@@ -2897,8 +2897,10 @@ void moduleLoadFromQueue(void) { ...@@ -2897,8 +2897,10 @@ void moduleLoadFromQueue(void) {
listRewind(server.loadmodule_queue,&li); listRewind(server.loadmodule_queue,&li);
while((ln = listNext(&li))) { while((ln = listNext(&li))) {
struct loadmodule *loadmod = ln->value; struct moduleLoadQueueEntry *loadmod = ln->value;
if (moduleLoad(loadmod->path,(void **)loadmod->argv,loadmod->argc) == C_ERR) { if (moduleLoad(loadmod->path,(void **)loadmod->argv,loadmod->argc)
== C_ERR)
{
serverLog(LL_WARNING, serverLog(LL_WARNING,
"Can't load module from %s: server aborting", "Can't load module from %s: server aborting",
loadmod->path); loadmod->path);
......
...@@ -683,7 +683,7 @@ struct saveparam { ...@@ -683,7 +683,7 @@ struct saveparam {
int changes; int changes;
}; };
struct loadmodule { struct moduleLoadQueueEntry {
sds path; sds path;
int argc; int argc;
robj *argv[]; robj *argv[];
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment