[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9636 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9636 - gnunet/src/util |
Date: |
Sun, 22 Nov 2009 13:54:12 -0700 |
Author: grothoff
Date: 2009-11-22 13:54:12 -0700 (Sun, 22 Nov 2009)
New Revision: 9636
Modified:
gnunet/src/util/configuration.c
gnunet/src/util/disk.c
gnunet/src/util/test_configuration.c
gnunet/src/util/test_disk.c
gnunet/src/util/test_pseudonym.c
Log:
fixing cosmetics and inlining of configurations
Modified: gnunet/src/util/configuration.c
===================================================================
--- gnunet/src/util/configuration.c 2009-11-22 20:23:41 UTC (rev 9635)
+++ gnunet/src/util/configuration.c 2009-11-22 20:54:12 UTC (rev 9636)
@@ -209,7 +209,7 @@
if (1 == sscanf (line, "@INLINE@ %191[^\n]", value))
{
/* @INLINE@ value */
- if (0 != GNUNET_CONFIGURATION_parse (cfg, value))
+ if (GNUNET_OK != GNUNET_CONFIGURATION_parse (cfg, value))
ret = GNUNET_SYSERR; /* failed to parse included config */
}
else if (1 == sscanf (line, "[%99[^]]]", value))
@@ -1140,7 +1140,7 @@
(!((filename == NULL) ||
(GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, filename)))))
{
- GNUNET_free (baseconfig);
+ GNUNET_free (baseconfig);
return GNUNET_SYSERR;
}
GNUNET_free (baseconfig);
Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c 2009-11-22 20:23:41 UTC (rev 9635)
+++ gnunet/src/util/disk.c 2009-11-22 20:54:12 UTC (rev 9636)
@@ -911,7 +911,7 @@
static int
remove_helper (void *unused, const char *fn)
{
- GNUNET_DISK_directory_remove (fn);
+ (void) GNUNET_DISK_directory_remove (fn);
return GNUNET_OK;
}
Modified: gnunet/src/util/test_configuration.c
===================================================================
--- gnunet/src/util/test_configuration.c 2009-11-22 20:23:41 UTC (rev
9635)
+++ gnunet/src/util/test_configuration.c 2009-11-22 20:54:12 UTC (rev
9636)
@@ -231,7 +231,7 @@
/* Compare the dumped configuration with modifications done */
cfg = GNUNET_CONFIGURATION_create ();
- GNUNET_CONFIGURATION_parse (cfg, diffsFileName);
+ GNUNET_assert (GNUNET_OK == GNUNET_CONFIGURATION_parse (cfg, diffsFileName));
remove (diffsFileName);
cbData.callBackOption = COMPARE;
cbData.cfgDiffs = cfgDiffs;
Modified: gnunet/src/util/test_disk.c
===================================================================
--- gnunet/src/util/test_disk.c 2009-11-22 20:23:41 UTC (rev 9635)
+++ gnunet/src/util/test_disk.c 2009-11-22 20:54:12 UTC (rev 9636)
@@ -211,7 +211,7 @@
GNUNET_CONFIGURATION_destroy (cfg);
ret = strcmp ("/tmp/test-gnunet-disk-a/b/c/d/e", fn);
GNUNET_free (fn);
- GNUNET_DISK_directory_remove ("/tmp/test-gnunet-disk-a");
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove
("/tmp/test-gnunet-disk-a"));
return ret;
}
Modified: gnunet/src/util/test_pseudonym.c
===================================================================
--- gnunet/src/util/test_pseudonym.c 2009-11-22 20:23:41 UTC (rev 9635)
+++ gnunet/src/util/test_pseudonym.c 2009-11-22 20:54:12 UTC (rev 9636)
@@ -111,7 +111,7 @@
GNUNET_log_setup ("test-pseudonym", "WARNING", NULL);
ok = GNUNET_YES;
GNUNET_CRYPTO_random_disable_entropy_gathering ();
- GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test");
+ (void) GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test");
cfg = GNUNET_CONFIGURATION_create ();
if (-1 == GNUNET_CONFIGURATION_parse (cfg, "test_pseudonym_data.conf"))
{
@@ -180,7 +180,7 @@
GNUNET_PSEUDONYM_discovery_callback_unregister (¬i_callback, ¬iCount);
GNUNET_CONTAINER_meta_data_destroy (meta);
GNUNET_CONFIGURATION_destroy (cfg);
- GNUNET_DISK_directory_remove ("/tmp/gnunet-pseudonym-test");
+ GNUNET_break (GNUNET_OK == GNUNET_DISK_directory_remove
("/tmp/gnunet-pseudonym-test"));
return (ok == GNUNET_YES) ? 0 : 1;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9636 - gnunet/src/util,
gnunet <=