[GNUnet-SVN] r11671 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2010-06-11 15:40:49 +0200 (Fri, 11 Jun 2010)
New Revision: 11671

Modified:
   gnunet/src/util/configuration.c
Log:
simplify

Modified: gnunet/src/util/configuration.c
===================================================================
--- gnunet/src/util/configuration.c     2010-06-11 11:42:58 UTC (rev 11670)
+++ gnunet/src/util/configuration.c     2010-06-11 13:40:49 UTC (rev 11671)
@@ -804,26 +804,20 @@
                                          const char *section,
                                          const char *option, char **value)
 {
-  int ret;
   char *tmp;
 
-  tmp = NULL;
-  ret = GNUNET_CONFIGURATION_get_value_string (cfg, section, option, &tmp);
-  if (ret == GNUNET_SYSERR)
-    return ret;
-  if (tmp != NULL)
+  if (GNUNET_OK !=
+      GNUNET_CONFIGURATION_get_value_string (cfg, section, option, &tmp))
     {
-      tmp = GNUNET_CONFIGURATION_expand_dollar (cfg, tmp);
-      *value = GNUNET_STRINGS_filename_expand (tmp);
-      GNUNET_free (tmp);
-      if (*value == NULL)
-        ret = GNUNET_SYSERR;
-    }
-  else
-    {
       *value = NULL;
+      return GNUNET_SYSERR;
     }
-  return ret;
+  tmp = GNUNET_CONFIGURATION_expand_dollar (cfg, tmp);
+  *value = GNUNET_STRINGS_filename_expand (tmp);
+  GNUNET_free (tmp);
+  if (*value == NULL)
+    return GNUNET_SYSERR;
+  return GNUNET_OK;
 }