← Back to branch summary

~brianaker/libmemcached/merge-1.0-april-2013

« back to all changes in this revision

Viewing changes to clients/memcp.cc

  • Committer: Continuous Integration
  • Date: 2013-04-03 13:16:24 UTC
  • mfrom: (1100.1.1 libmemcached-1.2)
  • Revision ID: ci@tangent.org-20130403131624-j59dhv5z5l0lsdld
Merge lp:~tangent-org/libmemcached/1.2-build/ Build: jenkins-Libmemcached-250

Show diffs side-by-side

added added

removed removed

Lines of Context:
clients/memcp.cc
129
129
    {
130
130
      opt_servers= strdup(temp);
131
131
    }
132
 
    else
 
132
    else if (argc >= 1 and argv[--argc])
 
133
    {
 
134
      opt_servers= strdup(argv[--argc]);
 
135
    }
 
136
 
 
137
    if (opt_servers == NULL)
133
138
    {
134
139
      std::cerr << "No Servers provided" << std::endl;
135
140
      exit(EXIT_FAILURE);
136
141
    }
137
142
  }
138
143
 
139
 
  memcached_server_st *servers;
140
 
  if (opt_servers)
141
 
  {
142
 
    servers= memcached_servers_parse(opt_servers);
143
 
  }
144
 
  else
145
 
  {
146
 
    servers= memcached_servers_parse(argv[--argc]);
 
144
  memcached_server_st* servers= memcached_servers_parse(opt_servers);
 
145
  if (servers == NULL or memcached_server_list_count(servers) == 0)
 
146
  {
 
147
    std::cerr << "Invalid server list provided:" << opt_servers << std::endl;
 
148
    return EXIT_FAILURE;
147
149
  }
148
150
 
149
151
  memcached_server_push(memc, servers);