<html><head><meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"><style>body { line-height: 1.5; }blockquote { margin-top: 0px; margin-bottom: 0px; margin-left: 0.5em; }body { font-size: 10.5pt; font-family: ????; color: rgb(0, 0, 0); line-height: 1.5; }</style></head><body>
<div><span></span><br></div><blockquote style="margin-top: 0px; margin-bottom: 0px; margin-left: 0.5em;"><div>On Wed, Mar 04, 2015 at 11:04:08AM +0800, Yu Yang wrote:</div>
<div>> From: Yu Yang <yuyang@cmss.chinamobile.com></div>
<div>> </div>
<div>> Append DEFAULT_BASE to hosts when cluster id is not set.</div>
<div>> </div>
<div>> Signed-off-by: Yu Yang <yuyang@cmss.chinamobile.com></div>
<div>> ---</div>
<div>> sheep/cluster/zookeeper.c | 12 +++++++++++-</div>
<div>> 1 file changed, 11 insertions(+), 1 deletion(-)</div>
<div>> </div>
<div>> diff --git a/sheep/cluster/zookeeper.c b/sheep/cluster/zookeeper.c</div>
<div>> index 4f85043..47cfa6c 100644</div>
<div>> --- a/sheep/cluster/zookeeper.c</div>
<div>> +++ b/sheep/cluster/zookeeper.c</div>
<div>> @@ -1466,7 +1466,17 @@ static int zk_init(const char *option)</div>
<div>> </div>
<div>> sd_info("version %d.%d.%d, address %s, timeout %d", ZOO_MAJOR_VERSION,</div>
<div>> ZOO_MINOR_VERSION, ZOO_PATCH_VERSION, hosts, zk_timeout);</div>
<div>> - if (zk_connect(hosts, zk_watcher, zk_timeout) < 0)</div>
<div>> + if (!strchr(hosts, '/')) {</div>
<div>> + char *tmp = (char *)malloc((strlen(hosts) +</div>
<div>> + strlen(DEFAULT_BASE) + 1)*sizeof(char));</div>
<div> </div>
<div>Please use xmalloc() here.</div>
<div> </div>
<div>Thanks,</div>
<div>Yuan</div><div><br></div><div>I find xmalloc() in util.c, but not xfree(), </div><div>then we use free here ?</div><div> </div><div><br></div><div><br></div>
</blockquote>
</body></html>