projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Bool fix.
[m6w6/libmemcached]
/
tests
/
server.c
diff --git
a/tests/server.c
b/tests/server.c
index 2528787c0a04d45e1370923c18d9378b62faa6f1..68b3d80146416ede910f85a8c963369dc09d8d98 100644
(file)
--- a/
tests/server.c
+++ b/
tests/server.c
@@
-1,10
+1,21
@@
+/* LibMemcached
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license. See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
+ */
+
/*
Startup, and shutdown the memcached servers.
*/
#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10
/*
Startup, and shutdown the memcached servers.
*/
#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10
-#include "
libmemcached/libmemcached_
config.h"
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-50,7
+61,7
@@
void server_startup(server_startup_st *construct)
{
if (fgets(buffer, sizeof(buffer), fp) != NULL)
{
{
if (fgets(buffer, sizeof(buffer), fp) != NULL)
{
- pid_t pid
= atol
(buffer);
+ pid_t pid
= (pid_t)atoi
(buffer);
if (pid != 0)
kill(pid, SIGTERM);
}
if (pid != 0)
kill(pid, SIGTERM);
}
@@
-84,11
+95,11
@@
void server_startup(server_startup_st *construct)
assert(construct->servers);
assert(construct->servers);
- srandom(time(NULL));
+ srandom(
(unsigned int)
time(NULL));
for (x= 0; x < memcached_server_list_count(construct->servers); x++)
{
for (x= 0; x < memcached_server_list_count(construct->servers); x++)
{
- printf("\t%s : %
u
\n", construct->servers[x].hostname, construct->servers[x].port);
+ printf("\t%s : %
d
\n", construct->servers[x].hostname, construct->servers[x].port);
assert(construct->servers[x].fd == -1);
assert(construct->servers[x].cursor_active == 0);
}
assert(construct->servers[x].fd == -1);
assert(construct->servers[x].cursor_active == 0);
}
@@
-106,7
+117,9
@@
void server_shutdown(server_startup_st *construct)
{
char buffer[1024]; /* Nothing special for number */
sprintf(buffer, "cat /tmp/%umemc.pid | xargs kill", x);
{
char buffer[1024]; /* Nothing special for number */
sprintf(buffer, "cat /tmp/%umemc.pid | xargs kill", x);
- system(buffer);
+ /* We have to check the return value of this or the compiler will yell */
+ int sys_ret= system(buffer);
+ assert(sys_ret != -1);
sprintf(buffer, "/tmp/%umemc.pid", x);
unlink(buffer);
}
sprintf(buffer, "/tmp/%umemc.pid", x);
unlink(buffer);
}