projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merging Trond, also fixed make test.
[m6w6/libmemcached]
/
tests
/
server.c
diff --git
a/tests/server.c
b/tests/server.c
index 2528787c0a04d45e1370923c18d9378b62faa6f1..e06fbd57e0d66cab5f91544c0b3080f5deb33bee 100644
(file)
--- a/
tests/server.c
+++ b/
tests/server.c
@@
-50,7
+50,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)
atol(buffer);
if (pid != 0)
kill(pid, SIGTERM);
}
if (pid != 0)
kill(pid, SIGTERM);
}
@@
-84,7
+84,7
@@
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++)
{
@@
-106,7
+106,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);
}