summaryrefslogtreecommitdiffstats
path: root/src/common/ceph_argparse.cc
diff options
context:
space:
mode:
authorSage Weil <sage@redhat.com>2019-01-10 19:32:42 +0100
committerSage Weil <sage@redhat.com>2019-01-16 15:33:03 +0100
commit8da9f5e759fc62c4a3dad0ddab5edf734a6b7edf (patch)
treeb3c8515694b39c6a3d438cc88a3ce32773b0973f /src/common/ceph_argparse.cc
parentmsg/msg_types: entity_addrvec_t: require brackets for size >1 (diff)
downloadceph-8da9f5e759fc62c4a3dad0ddab5edf734a6b7edf.tar.xz
ceph-8da9f5e759fc62c4a3dad0ddab5edf734a6b7edf.zip
common/ceph_argparse: parse_ip_port_vec returns addrvecs, not addrds
No functional change yet. Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/common/ceph_argparse.cc')
-rw-r--r--src/common/ceph_argparse.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/ceph_argparse.cc b/src/common/ceph_argparse.cc
index 13d2cfc1ed6..3de9f091bde 100644
--- a/src/common/ceph_argparse.cc
+++ b/src/common/ceph_argparse.cc
@@ -201,7 +201,8 @@ void ceph_arg_value_type(const char * nextargstr, bool *bool_option, bool *bool_
return;
}
-bool parse_ip_port_vec(const char *s, vector<entity_addr_t>& vec, int type)
+
+bool parse_ip_port_vec(const char *s, vector<entity_addrvec_t>& vec, int type)
{
const char *p = s;
const char *end = p + strlen(p);
@@ -213,7 +214,7 @@ bool parse_ip_port_vec(const char *s, vector<entity_addr_t>& vec, int type)
return false;
}
//cout << " got " << a << ", rest is '" << p << "'" << std::endl;
- vec.push_back(a);
+ vec.push_back(entity_addrvec_t(a));
while (*p == ',' || *p == ' ' || *p == ';')
p++;
}