[Ocfs2-tools-commits] smushran commits r857 - trunk/o2cb_ctl

[svn-commits at oss.oracle.com]

Author: smushran
Signed-off-by: masingh
Date: 2005-04-28 12:25:13 -0500 (Thu, 28 Apr 2005)
New Revision: 857

Modified:
   trunk/o2cb_ctl/jconfig.c
   trunk/o2cb_ctl/o2cb_config.c
Log:
cluster.conf attributes are chomped - trailing whitespaces are removed
Signed-off-by: masingh

Modified: trunk/o2cb_ctl/jconfig.c
===================================================================
--- trunk/o2cb_ctl/jconfig.c	2005-04-28 02:33:18 UTC (rev 856)
+++ trunk/o2cb_ctl/jconfig.c	2005-04-28 17:25:13 UTC (rev 857)
@@ -1501,6 +1501,7 @@
     
     s = (gchar *)g_hash_table_lookup(cfs->attrs, attr_name);
     s = g_strdup(s);
+    g_strchomp(s);
 
     return(s);
 }  /* j_config_get_attribute() */

Modified: trunk/o2cb_ctl/o2cb_config.c
===================================================================
--- trunk/o2cb_ctl/o2cb_config.c	2005-04-28 02:33:18 UTC (rev 856)
+++ trunk/o2cb_ctl/o2cb_config.c	2005-04-28 17:25:13 UTC (rev 857)
@@ -99,7 +99,6 @@
     num_s = j_config_get_attribute(cfs, "number");
     if (!num_s || !*num_s)
         goto out_error;
-    g_strchomp(num_s);
     val = strtoul(num_s, &ptr, 10);
     if (!ptr || *ptr)
         goto out_error;
@@ -120,7 +119,6 @@
     port_s = j_config_get_attribute(cfs, "ip_port");
     if (!port_s || !*port_s)
         goto out_error;
-    g_strchomp(port_s);
     val = strtoul(port_s, &ptr, 10);
     if (!ptr || *ptr)
         goto out_error;
@@ -182,7 +180,6 @@
     count = j_config_get_attribute(c_cfs, "node_count");
     if (!count || !*count)
         goto out_error;
-    g_strchomp(count);
     val = strtoul(count, &ptr, 10);
     if (!ptr || *ptr)
         goto out_error;