diff options
author | Christian Grothoff <christian@grothoff.org> | 2016-05-06 14:52:12 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2016-05-06 14:52:12 +0000 |
commit | 34aad61f423d2f6078ecfe51cb7a650fe528ab96 (patch) | |
tree | eb9cb60dfec80175d3102afc52e671622fc723f4 | |
parent | e8cf81fdb3fdaef59b49da8f6e952a3225ab326e (diff) | |
download | gnunet-34aad61f423d2f6078ecfe51cb7a650fe528ab96.tar.gz gnunet-34aad61f423d2f6078ecfe51cb7a650fe528ab96.zip |
fix ftbfs
-rw-r--r-- | src/jsonapi/Makefile.am | 1 | ||||
-rw-r--r-- | src/util/test_common_logging_runtime_loglevels.c | 22 |
2 files changed, 15 insertions, 8 deletions
diff --git a/src/jsonapi/Makefile.am b/src/jsonapi/Makefile.am index 22ae7dac5..f190d3e09 100644 --- a/src/jsonapi/Makefile.am +++ b/src/jsonapi/Makefile.am | |||
@@ -45,5 +45,6 @@ test_jsonapi_SOURCES = \ | |||
45 | test_jsonapi.c | 45 | test_jsonapi.c |
46 | test_jsonapi_LDADD = \ | 46 | test_jsonapi_LDADD = \ |
47 | libgnunetjsonapi.la \ | 47 | libgnunetjsonapi.la \ |
48 | $(top_builddir)/src/json/libgnunetjson.la \ | ||
48 | $(top_builddir)/src/util/libgnunetutil.la \ | 49 | $(top_builddir)/src/util/libgnunetutil.la \ |
49 | -ljansson | 50 | -ljansson |
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c index 033b16ce1..c633d7de8 100644 --- a/src/util/test_common_logging_runtime_loglevels.c +++ b/src/util/test_common_logging_runtime_loglevels.c | |||
@@ -179,16 +179,22 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2, | |||
179 | if (delay_is_a_dummy) | 179 | if (delay_is_a_dummy) |
180 | delay_outside_of_range = 1; | 180 | delay_outside_of_range = 1; |
181 | 181 | ||
182 | if (!stop) | 182 | if (! stop) |
183 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Wrong log format?\n"); | 183 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
184 | if (!level_matches) | 184 | "Wrong log format?\n"); |
185 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Wrong log level\n"); | 185 | if (! level_matches) |
186 | if (!delay_is_sane) | 186 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
187 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Delay %ld is insane\n", *delay); | 187 | "Wrong log level\n"); |
188 | if (!delay_outside_of_range) | 188 | if (! delay_is_sane) |
189 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
190 | "Delay %ld is insane\n", | ||
191 | *delay); | ||
192 | if (! delay_outside_of_range) | ||
189 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 193 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
190 | "Delay %ld is not outside of range (%ld ; %ld)\n", | 194 | "Delay %ld is not outside of range (%ld ; %ld)\n", |
191 | *delay, delay_lessthan, delay_morethan, c); | 195 | *delay, |
196 | delay_lessthan, | ||
197 | delay_morethan); | ||
192 | if (!stop || !level_matches || !delay_is_sane || !delay_outside_of_range) | 198 | if (!stop || !level_matches || !delay_is_sane || !delay_outside_of_range) |
193 | return NULL; | 199 | return NULL; |
194 | *len = *len - i; | 200 | *len = *len - i; |