/* LibMemcached
+ * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
* Copyright (C) 2006-2009 Brian Aker
* All rights reserved.
*
*
*/
-#include <config.h>
+#include <mem_config.h>
#include <cstdio>
#include <cstring>
#include <getopt.h>
#include <iostream>
#include <unistd.h>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
#include "utilities.h"
int main(int argc, char *argv[])
{
- memcached_st *memc;
char *string;
size_t string_length;
uint32_t flags;
memcached_return_t rc;
- memcached_server_st *servers;
int return_code= EXIT_SUCCESS;
options_parse(argc, argv);
initialize_sockets();
- if (!opt_servers)
+ if (opt_servers == NULL)
{
char *temp;
{
opt_servers= strdup(temp);
}
- else
+
+ if (opt_servers == NULL)
{
std::cerr << "No servers provied" << std::endl;
exit(EXIT_FAILURE);
}
}
- memc= memcached_create(NULL);
- process_hash_option(memc, opt_hash);
+ memcached_server_st* servers= memcached_servers_parse(opt_servers);
+ if (servers == NULL or memcached_server_list_count(servers) == 0)
+ {
+ std::cerr << "Invalid server list provided:" << opt_servers << std::endl;
+ return EXIT_FAILURE;
+ }
- servers= memcached_servers_parse(opt_servers);
+ memcached_st* memc= memcached_create(NULL);
+ process_hash_option(memc, opt_hash);
memcached_server_push(memc, servers);
memcached_server_list_free(servers);
void options_parse(int argc, char *argv[])
{
int option_index= 0;
- int option_rv;
memcached_programs_help_st help_options[]=
{
while (1)
{
- option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
+ int option_rv= getopt_long(argc, argv, "Vhvds:", long_options, &option_index);
if (option_rv == -1) break;
switch (option_rv)
{
case '?':
/* getopt_long already printed an error message. */
- exit(1);
+ exit(EXIT_FAILURE);
default:
abort();
}