diff options
author | t3sserakt <t3ss@posteo.de> | 2018-06-26 14:30:24 +0200 |
---|---|---|
committer | t3sserakt <t3ss@posteo.de> | 2018-06-26 14:31:15 +0200 |
commit | 52b006735e61d184281b56094758ecdc7355ed84 (patch) | |
tree | 2d5737544cd3af51ccdaefd634ef4ae8f1d54a42 /src | |
parent | 4af6e380bbda66c267737c753ee8357c8b99b0fa (diff) | |
parent | 585793ee0d0fd13939188fe0bf6279acd3d2b8ea (diff) | |
download | gnunet-52b006735e61d184281b56094758ecdc7355ed84.tar.gz gnunet-52b006735e61d184281b56094758ecdc7355ed84.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/gnunet-bcd.c | 4 | ||||
-rw-r--r-- | src/util/dnsstub.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gns/gnunet-bcd.c b/src/gns/gnunet-bcd.c index a82607b94..9737e1a49 100644 --- a/src/gns/gnunet-bcd.c +++ b/src/gns/gnunet-bcd.c | |||
@@ -469,7 +469,7 @@ run (void *cls, | |||
469 | "open", | 469 | "open", |
470 | fn); | 470 | fn); |
471 | GNUNET_free (fn); | 471 | GNUNET_free (fn); |
472 | CLOSE (fd); | 472 | GNUNET_break (0 == CLOSE (fd)); |
473 | return; | 473 | return; |
474 | } | 474 | } |
475 | GNUNET_free (fn); | 475 | GNUNET_free (fn); |
@@ -499,7 +499,7 @@ run (void *cls, | |||
499 | return; | 499 | return; |
500 | GNUNET_SCHEDULER_add_shutdown (&server_stop, | 500 | GNUNET_SCHEDULER_add_shutdown (&server_stop, |
501 | NULL); | 501 | NULL); |
502 | CLOSE(fd); | 502 | GNUNET_break (0 == CLOSE(fd)); |
503 | } | 503 | } |
504 | 504 | ||
505 | 505 | ||
diff --git a/src/util/dnsstub.c b/src/util/dnsstub.c index 8b5b20f3c..5b84e6e63 100644 --- a/src/util/dnsstub.c +++ b/src/util/dnsstub.c | |||
@@ -354,7 +354,7 @@ do_dns_read (struct GNUNET_DNSSTUB_RequestSocket *rs, | |||
354 | "Received DNS response from server we never asked (ignored)"); | 354 | "Received DNS response from server we never asked (ignored)"); |
355 | return GNUNET_NO; | 355 | return GNUNET_NO; |
356 | } | 356 | } |
357 | if (sizeof (struct GNUNET_TUN_DnsHeader) > r) | 357 | if (sizeof (struct GNUNET_TUN_DnsHeader) > (size_t) r) |
358 | { | 358 | { |
359 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 359 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, |
360 | _("Received DNS response that is too small (%u bytes)"), | 360 | _("Received DNS response that is too small (%u bytes)"), |