You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ma...@apache.org on 2011/08/26 09:51:54 UTC
svn commit: r1162015 - in /zookeeper/branches/branch-3.3: CHANGES.txt
src/c/src/cli.c src/c/src/zookeeper.c
Author: mahadev
Date: Fri Aug 26 07:51:53 2011
New Revision: 1162015
URL: http://svn.apache.org/viewvc?rev=1162015&view=rev
Log:
ZOOKEEPER-1117. zookeeper 3.3.3 fails to build with gcc >= 4.6.1 on Debian/Ubuntu (James Page via mahadev)
Modified:
zookeeper/branches/branch-3.3/CHANGES.txt
zookeeper/branches/branch-3.3/src/c/src/cli.c
zookeeper/branches/branch-3.3/src/c/src/zookeeper.c
Modified: zookeeper/branches/branch-3.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1162015&r1=1162014&r2=1162015&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.3/CHANGES.txt Fri Aug 26 07:51:53 2011
@@ -10,6 +10,9 @@ BUGFIXES:
ZOOKEEPER-1097. Quota is not correctly rehydrated on snapshot reload (camille via henryr)
+ ZOOKEEPER-1117. zookeeper 3.3.3 fails to build with gcc >= 4.6.1 on
+ Debian/Ubuntu (James Page via mahadev)
+
Release 3.3.3 - 2011-02-23
Backward compatible changes:
Modified: zookeeper/branches/branch-3.3/src/c/src/cli.c
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/c/src/cli.c?rev=1162015&r1=1162014&r2=1162015&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/c/src/cli.c (original)
+++ zookeeper/branches/branch-3.3/src/c/src/cli.c Fri Aug 26 07:51:53 2011
@@ -581,11 +581,13 @@ int main(int argc, char **argv) {
FD_SET(0, &rfds);
rc = select(fd+1, &rfds, &wfds, &efds, &tv);
events = 0;
- if (FD_ISSET(fd, &rfds)) {
- events |= ZOOKEEPER_READ;
- }
- if (FD_ISSET(fd, &wfds)) {
- events |= ZOOKEEPER_WRITE;
+ if (rc > 0) {
+ if (FD_ISSET(fd, &rfds)) {
+ events |= ZOOKEEPER_READ;
+ }
+ if (FD_ISSET(fd, &wfds)) {
+ events |= ZOOKEEPER_WRITE;
+ }
}
if(batchMode && processed==0){
//batch mode
Modified: zookeeper/branches/branch-3.3/src/c/src/zookeeper.c
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/c/src/zookeeper.c?rev=1162015&r1=1162014&r2=1162015&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/c/src/zookeeper.c (original)
+++ zookeeper/branches/branch-3.3/src/c/src/zookeeper.c Fri Aug 26 07:51:53 2011
@@ -462,7 +462,7 @@ int getaddrs(zhandle_t *zh)
*port_spec = '\0';
port_spec++;
port = strtol(port_spec, &end_port_spec, 0);
- if (!*port_spec || *end_port_spec) {
+ if (!*port_spec || *end_port_spec || port == 0) {
LOG_ERROR(("invalid port in %s", host));
errno=EINVAL;
rc=ZBADARGUMENTS;