[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37136 - in gnunet/src: jsonapi util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37136 - in gnunet/src: jsonapi util |
Date: |
Fri, 6 May 2016 16:52:13 +0200 |
Author: grothoff
Date: 2016-05-06 16:52:12 +0200 (Fri, 06 May 2016)
New Revision: 37136
Modified:
gnunet/src/jsonapi/Makefile.am
gnunet/src/util/test_common_logging_runtime_loglevels.c
Log:
fix ftbfs
Modified: gnunet/src/jsonapi/Makefile.am
===================================================================
--- gnunet/src/jsonapi/Makefile.am 2016-05-06 14:48:47 UTC (rev 37135)
+++ gnunet/src/jsonapi/Makefile.am 2016-05-06 14:52:12 UTC (rev 37136)
@@ -45,5 +45,6 @@
test_jsonapi.c
test_jsonapi_LDADD = \
libgnunetjsonapi.la \
+ $(top_builddir)/src/json/libgnunetjson.la \
$(top_builddir)/src/util/libgnunetutil.la \
-ljansson
Modified: gnunet/src/util/test_common_logging_runtime_loglevels.c
===================================================================
--- gnunet/src/util/test_common_logging_runtime_loglevels.c 2016-05-06
14:48:47 UTC (rev 37135)
+++ gnunet/src/util/test_common_logging_runtime_loglevels.c 2016-05-06
14:52:12 UTC (rev 37136)
@@ -179,16 +179,22 @@
if (delay_is_a_dummy)
delay_outside_of_range = 1;
- if (!stop)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Wrong log format?\n");
- if (!level_matches)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Wrong log level\n");
- if (!delay_is_sane)
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Delay %ld is insane\n", *delay);
- if (!delay_outside_of_range)
+ if (! stop)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Wrong log format?\n");
+ if (! level_matches)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Wrong log level\n");
+ if (! delay_is_sane)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Delay %ld is insane\n",
+ *delay);
+ if (! delay_outside_of_range)
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Delay %ld is not outside of range (%ld ; %ld)\n",
- *delay, delay_lessthan, delay_morethan, c);
+ *delay,
+ delay_lessthan,
+ delay_morethan);
if (!stop || !level_matches || !delay_is_sane || !delay_outside_of_range)
return NULL;
*len = *len - i;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37136 - in gnunet/src: jsonapi util,
gnunet <=