projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix include
[awesomized/libmemcached]
/
libtest
/
cmdline.cc
diff --git
a/libtest/cmdline.cc
b/libtest/cmdline.cc
index 94c41814a0af35236d8cb6b37f13783427699311..cbe8ff9a53ea70754cf7c8aa6f98c3a666c68576 100644
(file)
--- a/
libtest/cmdline.cc
+++ b/
libtest/cmdline.cc
@@
-79,7
+79,10
@@
namespace {
iter != built_argv.end();
++iter)
{
iter != built_argv.end();
++iter)
{
- arg_buffer << *iter << " ";
+ if (*iter)
+ {
+ arg_buffer << *iter << " ";
+ }
}
return arg_buffer.str();
}
return arg_buffer.str();
@@
-359,7
+362,7
@@
bool Application::slurp()
int error;
switch ((error= errno))
{
int error;
switch ((error= errno))
{
-#ifdef
TARGET_OS_LINUX
+#ifdef
__linux
case ERESTART:
#endif
case EINTR:
case ERESTART:
#endif
case EINTR:
@@
-784,7
+787,7
@@
void Application::create_argv(const char *args[])
vchar::append(built_argv, *ptr);
}
}
vchar::append(built_argv, *ptr);
}
}
- built_argv.push_back(
NULL
);
+ built_argv.push_back(
nullptr
);
}
std::string Application::print()
}
std::string Application::print()