[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r12828 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r12828 - gnunet/src/util |
Date: |
Fri, 3 Sep 2010 23:20:41 +0200 |
Author: grothoff
Date: 2010-09-03 23:20:41 +0200 (Fri, 03 Sep 2010)
New Revision: 12828
Modified:
gnunet/src/util/test_bio.c
gnunet/src/util/test_container_heap.c
gnunet/src/util/test_crypto_rsa.c
gnunet/src/util/test_service.c
Log:
nitpicks
Modified: gnunet/src/util/test_bio.c
===================================================================
--- gnunet/src/util/test_bio.c 2010-09-03 21:16:31 UTC (rev 12827)
+++ gnunet/src/util/test_bio.c 2010-09-03 21:20:41 UTC (rev 12828)
@@ -58,6 +58,7 @@
GNUNET_assert (GNUNET_OK ==
GNUNET_BIO_read_string (fileR, "Read string error",
&readResultString, 200));
+ GNUNET_assert (NULL != readResultString);
GNUNET_assert (0 == strcmp (TESTSTRING, readResultString));
GNUNET_free (readResultString);
GNUNET_assert (GNUNET_OK ==
Modified: gnunet/src/util/test_container_heap.c
===================================================================
--- gnunet/src/util/test_container_heap.c 2010-09-03 21:16:31 UTC (rev
12827)
+++ gnunet/src/util/test_container_heap.c 2010-09-03 21:20:41 UTC (rev
12828)
@@ -49,6 +49,7 @@
struct GNUNET_CONTAINER_HeapNode *n6;
struct GNUNET_CONTAINER_HeapNode *n7;
struct GNUNET_CONTAINER_HeapNode *n8;
+ const char *r;
myHeap = GNUNET_CONTAINER_heap_create (GNUNET_CONTAINER_HEAP_ORDER_MIN);
@@ -101,14 +102,19 @@
n6 = GNUNET_CONTAINER_heap_insert (myHeap, "30/200", 30);
GNUNET_assert (5 == GNUNET_CONTAINER_heap_get_size (myHeap));
GNUNET_CONTAINER_heap_remove_node (myHeap, n5);
+ r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n1 */
+ GNUNET_assert (NULL != r);
GNUNET_assert (0 == strcmp ("11",
- GNUNET_CONTAINER_heap_remove_root (myHeap))); /*
n1 */
+ r));
GNUNET_CONTAINER_heap_update_cost (myHeap, n6, 200);
GNUNET_CONTAINER_heap_remove_node (myHeap, n3);
+ r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n4 */
+ GNUNET_assert (NULL != r);
GNUNET_assert (0 == strcmp ("50",
- GNUNET_CONTAINER_heap_remove_root (myHeap))); /*
n4 */
- GNUNET_assert (0 == strcmp ("30/200",
- GNUNET_CONTAINER_heap_remove_root (myHeap))); /*
n6 */
+ r));
+ r = GNUNET_CONTAINER_heap_remove_root (myHeap); /* n6 */
+ GNUNET_assert (NULL != r);
+ GNUNET_assert (0 == strcmp ("30/200", r));
GNUNET_assert (0 == GNUNET_CONTAINER_heap_get_size (myHeap));
GNUNET_CONTAINER_heap_destroy (myHeap);
Modified: gnunet/src/util/test_crypto_rsa.c
===================================================================
--- gnunet/src/util/test_crypto_rsa.c 2010-09-03 21:16:31 UTC (rev 12827)
+++ gnunet/src/util/test_crypto_rsa.c 2010-09-03 21:20:41 UTC (rev 12828)
@@ -289,14 +289,17 @@
struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded p2;
key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+ GNUNET_assert (NULL != key);
GNUNET_CRYPTO_rsa_key_get_public (key, &p1);
GNUNET_CRYPTO_rsa_key_free (key);
- key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+ key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+ GNUNET_assert (NULL != key);
GNUNET_CRYPTO_rsa_key_get_public (key, &p2);
GNUNET_assert (0 == memcmp (&p1, &p2, sizeof (p1)));
GNUNET_CRYPTO_rsa_key_free (key);
GNUNET_assert (0 == UNLINK (KEYFILE));
key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+ GNUNET_assert (NULL != key);
GNUNET_CRYPTO_rsa_key_get_public (key, &p2);
GNUNET_assert (0 != memcmp (&p1, &p2, sizeof (p1)));
GNUNET_CRYPTO_rsa_key_free (key);
Modified: gnunet/src/util/test_service.c
===================================================================
--- gnunet/src/util/test_service.c 2010-09-03 21:16:31 UTC (rev 12827)
+++ gnunet/src/util/test_service.c 2010-09-03 21:20:41 UTC (rev 12828)
@@ -229,6 +229,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Starting service using start method\n");
sctx = GNUNET_SERVICE_start ("test_service", sched, cfg);
+ GNUNET_assert (NULL != sctx);
runner (cls, sched, GNUNET_SERVICE_get_server (sctx), cfg);
*ret = 0;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r12828 - gnunet/src/util,
gnunet <=