projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Updated to latest memcached
[awesomized/libmemcached]
/
libtest
/
cmdline.cc
diff --git
a/libtest/cmdline.cc
b/libtest/cmdline.cc
index 3179d1928c89a07c101a57d2b5ce16172018deff..f43b1c28b72ca970d679e0b274ca5faa7ddc7628 100644
(file)
--- a/
libtest/cmdline.cc
+++ b/
libtest/cmdline.cc
@@
-82,7
+82,6
@@
extern "C" {
namespace {
namespace {
-#if 0
std::string print_argv(libtest::vchar_ptr_t& built_argv)
{
std::stringstream arg_buffer;
std::string print_argv(libtest::vchar_ptr_t& built_argv)
{
std::stringstream arg_buffer;
@@
-96,8
+95,8
@@
namespace {
return arg_buffer.str();
}
return arg_buffer.str();
}
-#endif
+#if 0
std::string print_argv(char** argv)
{
std::stringstream arg_buffer;
std::string print_argv(char** argv)
{
std::stringstream arg_buffer;
@@
-109,6
+108,8
@@
namespace {
return arg_buffer.str();
}
return arg_buffer.str();
}
+#endif
+
static Application::error_t int_to_error_t(int arg)
{
static Application::error_t int_to_error_t(int arg)
{
@@
-458,6
+459,7
@@
Application::error_t Application::wait(bool nohang)
if (exit_code == Application::INVALID)
{
Error << print_argv(built_argv, _argc);
if (exit_code == Application::INVALID)
{
Error << print_argv(built_argv, _argc);
+ /
}
#endif
}
#endif
@@
-514,13
+516,11
@@
Application::error_t Application::join()
slurp();
slurp();
-#if 0
if (exit_code == Application::INVALID)
{
if (exit_code == Application::INVALID)
{
- Error << print_argv(built_argv
, _argc
);
+ Error << print_argv(built_argv);
}
}
-#endif
-
+;
return exit_code;
}
return exit_code;
}