From 29e75759d574952db96d9a85e20804af1eec7327 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Tue, 26 Feb 2013 18:34:53 +0530 Subject: libglusterfs: avoid the logging which says the port is invalid If the reserved ports file in proc contains just a newline, then do not proceed with ports checking and reserving. Change-Id: If610b0e49a97e5c22e7e2b1bb4155c9616a4612a BUG: 762989 Signed-off-by: Raghavendra Bhat Reviewed-on: http://review.gluster.org/4583 Tested-by: Gluster Build System Reviewed-by: Jeff Darcy --- libglusterfs/src/common-utils.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'libglusterfs') diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c index 95b8abf69..c49e6d1f5 100644 --- a/libglusterfs/src/common-utils.c +++ b/libglusterfs/src/common-utils.c @@ -2291,17 +2291,11 @@ gf_process_reserved_ports (gf_boolean_t *ports) goto out; } - blocked_port = strtok_r (ports_info, ",",&tmp); - if (!blocked_port || !strcmp (blocked_port, ports_info)) { - if (!blocked_port) - blocked_port = ports_info; - gf_ports_reserved (blocked_port, ports); - blocked_port = strtok_r (NULL, ",", &tmp); - } + blocked_port = strtok_r (ports_info, ",\n",&tmp); while (blocked_port) { gf_ports_reserved (blocked_port, ports); - blocked_port = strtok_r (NULL, ",", &tmp); + blocked_port = strtok_r (NULL, ",\n", &tmp); } ret = 0; -- cgit