projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in util/libtest update
[awesomized/libmemcached]
/
clients
/
memcat.cc
diff --git
a/clients/memcat.cc
b/clients/memcat.cc
index fdbcb67ea5180edee241bfe378aa2235dbf3ca0c..3e073650345750b35b3325855f1b4fe63af77fca 100644
(file)
--- a/
clients/memcat.cc
+++ b/
clients/memcat.cc
@@
-9,14
+9,13
@@
*
*/
*
*/
-#include
"config.h"
+#include
<config.h>
+#include <cstdio>
+#include <cstring>
+#include <getopt.h>
#include <iostream>
#include <iostream>
-#include <stdio.h>
-#include <inttypes.h>
-#include <string.h>
#include <unistd.h>
#include <unistd.h>
-#include <getopt.h>
#include <libmemcached/memcached.h>
#include "utilities.h"
#include <libmemcached/memcached.h>
#include "utilities.h"
@@
-81,10
+80,15
@@
int main(int argc, char *argv[])
return EXIT_FAILURE;
}
return EXIT_FAILURE;
}
- if (opt_username
and initialize_sasl(memc, opt_username, opt_passwd) == false
)
+ if (opt_username)
{
{
- memcached_free(memc);
- return EXIT_FAILURE;
+ memcached_return_t ret;
+ if (memcached_failed(ret= memcached_set_sasl_auth_data(memc, opt_username, opt_passwd)))
+ {
+ std::cerr << memcached_last_error_message(memc) << std::endl;
+ memcached_free(memc);
+ return EXIT_FAILURE;
+ }
}
while (optind < argc)
}
while (optind < argc)
@@
-170,8
+174,6
@@
int main(int argc, char *argv[])
if (opt_hash)
free(opt_hash);
if (opt_hash)
free(opt_hash);
- shutdown_sasl();
-
return return_code;
}
return return_code;
}