[Ocfs2-tools-commits] jlbec commits r1152 - trunk/o2cb_ctl

[svn-commits@oss.oracle.com]

Author: jlbec
Date: 2006-02-15 19:51:39 -0600 (Wed, 15 Feb 2006)
New Revision: 1152

Modified:
   trunk/o2cb_ctl/jconfig.c
   trunk/o2cb_ctl/o2cb_config.c
Log:

o jconfig.c assumes that g_strchomp(NULL) is valid.  It isn't.
o o2cb_config_fill() return code was being ignored.



Modified: trunk/o2cb_ctl/jconfig.c
===================================================================
--- trunk/o2cb_ctl/jconfig.c	2006-02-14 00:36:58 UTC (rev 1151)
+++ trunk/o2cb_ctl/jconfig.c	2006-02-16 01:51:39 UTC (rev 1152)
@@ -1501,7 +1501,8 @@
     
     s = (gchar *)g_hash_table_lookup(cfs->attrs, attr_name);
     s = g_strdup(s);
-    g_strchomp(s);
+    if (s)
+        g_strchomp(s);
 
     return(s);
 }  /* j_config_get_attribute() */

Modified: trunk/o2cb_ctl/o2cb_config.c
===================================================================
--- trunk/o2cb_ctl/o2cb_config.c	2006-02-14 00:36:58 UTC (rev 1151)
+++ trunk/o2cb_ctl/o2cb_config.c	2006-02-16 01:51:39 UTC (rev 1152)
@@ -276,7 +276,7 @@
 
     j_config_free(cf);
 
-    return 0;
+    return rc;
 }  /* o2cb_config_load() */
 
 static gint o2cb_node_store(JConfig *cf, O2CBCluster *cluster,