X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fserver.c;fp=tests%2Fserver.c;h=c96f5972dbda3a5c2b2e32df8ea43bed999e0fd9;hb=475f477dab6dfc5e4f018d1ecfb128c37e2c44a0;hp=383469bd5b846307c8812396bfdb995a57331fcb;hpb=98f41b0d540b293252e0bc25c77be53f397f7aeb;p=awesomized%2Flibmemcached diff --git a/tests/server.c b/tests/server.c index 383469bd..c96f5972 100644 --- a/tests/server.c +++ b/tests/server.c @@ -13,7 +13,7 @@ Startup, and shutdown the memcached servers. */ -#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10 +#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10 #include "config.h" @@ -52,7 +52,7 @@ void server_startup(server_startup_st *construct) int status; sprintf(buffer, "/tmp/%umemc.pid", x); - if (access(buffer, F_OK) == 0) + if (access(buffer, F_OK) == 0) { FILE *fp= fopen(buffer, "r"); remove(buffer); @@ -60,9 +60,9 @@ void server_startup(server_startup_st *construct) if (fp != NULL) { if (fgets(buffer, sizeof(buffer), fp) != NULL) - { + { pid_t pid= (pid_t)atoi(buffer); - if (pid != 0) + if (pid != 0) kill(pid, SIGTERM); } @@ -74,7 +74,7 @@ void server_startup(server_startup_st *construct) { sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u -m 128", MEMCACHED_BINARY, x, x + TEST_PORT_BASE, x + TEST_PORT_BASE); - } + } else { sprintf(buffer, "%s -d -P /tmp/%umemc.pid -t 1 -p %u -U %u", @@ -119,7 +119,7 @@ void server_shutdown(server_startup_st *construct) sprintf(buffer, "cat /tmp/%umemc.pid | xargs kill", x); /* We have to check the return value of this or the compiler will yell */ int sys_ret= system(buffer); - assert(sys_ret != -1); + assert(sys_ret != -1); sprintf(buffer, "/tmp/%umemc.pid", x); unlink(buffer); }