projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-200
[awesomized/libmemcached]
/
libtest
/
blobslap_worker.cc
diff --git
a/libtest/blobslap_worker.cc
b/libtest/blobslap_worker.cc
index dbd41ac6df19eb9a796f65649cc0fedd92856a67..612847e54bafe92f674438eb13e3e452f9f955e2 100644
(file)
--- a/
libtest/blobslap_worker.cc
+++ b/
libtest/blobslap_worker.cc
@@
-35,7
+35,7
@@
*/
*/
-#include
<config.h>
+#include
"libtest/yatlcon.h"
#include <libtest/common.h>
#include <libtest/blobslap_worker.h>
#include <libtest/common.h>
#include <libtest/blobslap_worker.h>
@@
-51,8
+51,6
@@
#include <sys/wait.h>
#include <unistd.h>
#include <sys/wait.h>
#include <unistd.h>
-#include <libgearman/gearman.h>
-
#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wold-style-cast"
#endif
@@
-160,6
+158,11
@@
bool BlobslapWorker::build(size_t argc, const char *argv[])
for (size_t x= 0 ; x < argc ; x++)
{
for (size_t x= 0 ; x < argc ; x++)
{
+ if (argv[x] == NULL)
+ {
+ break;
+ }
+
add_option(argv[x]);
}
add_option(argv[x]);
}