X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fserver.c;h=c96f5972dbda3a5c2b2e32df8ea43bed999e0fd9;hb=3430cb015fb0add207ff733f484dbb4a9fed3655;hp=68b3d80146416ede910f85a8c963369dc09d8d98;hpb=55b5455291498ef63c1c34976552d58708a74732;p=m6w6%2Flibmemcached

diff --git a/tests/server.c b/tests/server.c
index 68b3d801..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",
@@ -99,7 +99,7 @@ void server_startup(server_startup_st *construct)
 
   for (x= 0; x < memcached_server_list_count(construct->servers); x++)
   {
-    printf("\t%s : %d\n", construct->servers[x].hostname, construct->servers[x].port);
+    printf("\t%s : %d\n", memcached_server_name(&construct->servers[x]), memcached_server_port(&construct->servers[x]));
     assert(construct->servers[x].fd == -1);
     assert(construct->servers[x].cursor_active == 0);
   }
@@ -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);
     }