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

[gnunet]

Author: grothoff
Date: 2011-06-30 22:34:47 +0200 (Thu, 30 Jun 2011)
New Revision: 15802

Modified:
   gnunet/src/util/configuration.c
Log:
support infinity/forever for time value in configuration

Modified: gnunet/src/util/configuration.c
===================================================================
--- gnunet/src/util/configuration.c     2011-06-30 20:32:23 UTC (rev 15801)
+++ gnunet/src/util/configuration.c     2011-06-30 20:34:47 UTC (rev 15802)
@@ -690,13 +690,22 @@
                                      const char *option,
                                      struct GNUNET_TIME_Relative *time)
 {
+  struct ConfigEntry *e;
   unsigned long long num;
-  int ret;
 
-  ret = GNUNET_CONFIGURATION_get_value_number (cfg, section, option, &num);
-  if (ret == GNUNET_OK)
-    time->rel_value = (uint64_t) num;
-  return ret;
+  e = findEntry (cfg, section, option);
+  if (e == NULL)
+    return GNUNET_SYSERR;
+  if ( (0 == strcasecmp (e->val, "infinity")) ||
+       (0 == strcasecmp (e->val, "forever")) )
+    {
+      *time = GNUNET_TIME_UNIT_FOREVER_REL;
+      return GNUNET_OK;
+    }
+  if (1 != SSCANF (e->val, "%llu", &num))
+    return GNUNET_SYSERR;
+  time->rel_value = (uint64_t) num;
+  return GNUNET_OK;
 }