projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge of cppccheck fixes.
[m6w6/libmemcached]
/
libtest
/
server_container.cc
diff --git
a/libtest/server_container.cc
b/libtest/server_container.cc
index d8ef5d495364ad4c51e42722b3a70faeb20a67ac..0448e20900e2b847831a6f5c802a073e68eb9135 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-287,17
+287,16
@@
bool server_startup_st::start_server(const std::string& server_type, in_port_t t
server->build(argc, argv);
server->build(argc, argv);
+#if 0
if (false)
{
Out << "Pausing for startup, hit return when ready.";
std::string gdb_command= server->base_command();
if (false)
{
Out << "Pausing for startup, hit return when ready.";
std::string gdb_command= server->base_command();
- std::string options;
-#if 0
- Out << "run " << server->args(options);
-#endif
getchar();
}
getchar();
}
- else if (server->start() == false)
+ else
+#endif
+ if (server->start() == false)
{
delete server;
return false;
{
delete server;
return false;
@@
-397,17
+396,18
@@
bool server_startup_st::start_socket_server(const std::string& server_type, cons
server->build(argc, argv);
server->build(argc, argv);
+#if 0
if (false)
{
Out << "Pausing for startup, hit return when ready.";
std::string gdb_command= server->base_command();
std::string options;
if (false)
{
Out << "Pausing for startup, hit return when ready.";
std::string gdb_command= server->base_command();
std::string options;
-#if 0
Out << "run " << server->args(options);
Out << "run " << server->args(options);
-#endif
getchar();
}
getchar();
}
- else if (server->start() == false)
+ else
+#endif
+ if (server->start() == false)
{
Error << "Failed to start " << *server;
delete server;
{
Error << "Failed to start " << *server;
delete server;