diff options
| author | Trond Norbye <trond.norbye@gmail.com> | 2011-07-15 07:10:25 +0200 |
|---|---|---|
| committer | Trond Norbye <trond.norbye@gmail.com> | 2011-07-15 07:10:25 +0200 |
| commit | 2363dc27f28d53ba06e7c262c8cf30a5f83b4f9d (patch) | |
| tree | 2dcf8d029ef24ed2a523d40953ef9fbaa8c9c762 | |
| parent | 1d251a2495040dbd74e170008115aad19143982b (diff) | |
| download | memcached-2363dc27f28d53ba06e7c262c8cf30a5f83b4f9d.tar.gz | |
Remove unused variables
| -rw-r--r-- | daemon/memcached.c | 4 | ||||
| -rw-r--r-- | engines/default_engine/default_engine.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/daemon/memcached.c b/daemon/memcached.c index ec0c94f..d1df8c3 100644 --- a/daemon/memcached.c +++ b/daemon/memcached.c @@ -6903,7 +6903,6 @@ int main (int argc, char **argv) { int c; bool lock_memory = false; bool do_daemonize = false; - bool preallocate = false; int maxcore = 0; char *username = NULL; char *pid_file = NULL; @@ -7101,7 +7100,6 @@ int main (int argc, char **argv) { break; case 'L' : if (enable_large_pages() == 0) { - preallocate = true; old_opts += sprintf(old_opts, "preallocate=true;"); } break; @@ -7506,7 +7504,7 @@ int main (int argc, char **argv) { udp_port = settings.udpport ? settings.udpport : settings.port; /* create the UDP listening socket and bind it */ - if (settings.udpport && server_sockets(settings.udpport, udp_transport, + if (settings.udpport && server_sockets(udp_port, udp_transport, portnumber_file)) { settings.extensions.logger->log(EXTENSION_LOG_WARNING, NULL, "failed to listen on UDP port %d: %s", diff --git a/engines/default_engine/default_engine.c b/engines/default_engine/default_engine.c index f481253..e877ecc 100644 --- a/engines/default_engine/default_engine.c +++ b/engines/default_engine/default_engine.c @@ -551,7 +551,7 @@ static ENGINE_ERROR_CODE initalize_configuration(struct default_engine *se, set_vbucket_state(se, 0, vbucket_state_active); } - return ENGINE_SUCCESS; + return ret; } static bool set_vbucket(struct default_engine *e, |