projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
If we compile not under a SCM system, assume that we should not use -Werror
[awesomized/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index adf650f8c770df28b23dc73612af957f31437c70..37a3102eab96b448fb3db10e7abbdc2d0c90d59f 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-150,7
+150,7
@@
public:
if (memcached_failed(rc) or ret == false)
{
if (memcached_failed(rc) or ret == false)
{
-
Error << "libmemcached_util_ping(" << hostname() << ", " << port() << ") error: " << memcached_strerror(NULL, rc
);
+
error(memcached_strerror(NULL, rc)
);
}
return ret;
}
return ret;
@@
-332,16
+332,6
@@
public:
bool ping()
{
bool ping()
{
- // Memcached is slow to start, so we need to do this
- if (pid_file().empty() == false)
- {
- if (wait_for_pidfile() == false)
- {
- Error << "Pidfile was not found:" << pid_file();
- return -1;
- }
- }
-
memcached_return_t rc;
bool ret;
memcached_return_t rc;
bool ret;
@@
-356,7
+346,7
@@
public:
if (memcached_failed(rc) or ret == false)
{
if (memcached_failed(rc) or ret == false)
{
-
Error << "libmemcached_util_ping2(" << hostname() << ", " << port() << ", " << username() << ", " << password() << ") error: " << memcached_strerror(NULL, rc
);
+
error(memcached_strerror(NULL, rc)
);
}
return ret;
}
return ret;
@@
-385,7
+375,7
@@
bool Memcached::build(size_t argc, const char *argv[])
add_option(sasl());
}
add_option(sasl());
}
- for (
in
t x= 0 ; x < argc ; x++)
+ for (
size_
t x= 0 ; x < argc ; x++)
{
add_option(argv[x]);
}
{
add_option(argv[x]);
}