aboutsummaryrefslogtreecommitdiff
path: root/src/hostlist
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2020-07-18 00:44:39 +0200
committerChristian Grothoff <christian@grothoff.org>2020-07-18 00:44:39 +0200
commit7f4ddbcab8598e3d5e29c23ce883cdfa664408f1 (patch)
tree5f1b18463f641f24fad519e0aefb60b97d707b52 /src/hostlist
parent28ab2c446fba4980a8295d59fdf203a028a35dd6 (diff)
downloadgnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.tar.gz
gnunet-7f4ddbcab8598e3d5e29c23ce883cdfa664408f1.zip
merge flags into enum for GNUNET_DISK_pipe() API, fixing #6188
Diffstat (limited to 'src/hostlist')
-rw-r--r--src/hostlist/gnunet-daemon-hostlist_client.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c
index 5dc2e7f2a..b377f2041 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -540,12 +540,12 @@ download_get_url ()
540 { \ 540 { \
541 ret = curl_easy_setopt (c, a, b); \ 541 ret = curl_easy_setopt (c, a, b); \
542 if (CURLE_OK != ret) \ 542 if (CURLE_OK != ret) \
543 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, \ 543 GNUNET_log (GNUNET_ERROR_TYPE_WARNING, \
544 _ ("%s failed at %s:%d: `%s'\n"), \ 544 _ ("%s failed at %s:%d: `%s'\n"), \
545 "curl_easy_setopt", \ 545 "curl_easy_setopt", \
546 __FILE__, \ 546 __FILE__, \
547 __LINE__, \ 547 __LINE__, \
548 curl_easy_strerror (ret)); \ 548 curl_easy_strerror (ret)); \
549 } while (0) 549 } while (0)
550 550
551 551
@@ -1418,11 +1418,12 @@ load_hostlist_file ()
1418 1418
1419 counter = 0; 1419 counter = 0;
1420 struct GNUNET_BIO_ReadSpec rs[] = { 1420 struct GNUNET_BIO_ReadSpec rs[] = {
1421 GNUNET_BIO_read_spec_int32 ("times used", (int32_t *)&times_used), 1421 GNUNET_BIO_read_spec_int32 ("times used", (int32_t *) &times_used),
1422 GNUNET_BIO_read_spec_int64 ("quality", (int64_t *) &quality), 1422 GNUNET_BIO_read_spec_int64 ("quality", (int64_t *) &quality),
1423 GNUNET_BIO_read_spec_int64 ("last used", (int64_t *) &last_used), 1423 GNUNET_BIO_read_spec_int64 ("last used", (int64_t *) &last_used),
1424 GNUNET_BIO_read_spec_int64 ("created", (int64_t *) &created), 1424 GNUNET_BIO_read_spec_int64 ("created", (int64_t *) &created),
1425 GNUNET_BIO_read_spec_int32 ("hellos returned", (int32_t *) &hellos_returned), 1425 GNUNET_BIO_read_spec_int32 ("hellos returned",
1426 (int32_t *) &hellos_returned),
1426 GNUNET_BIO_read_spec_end (), 1427 GNUNET_BIO_read_spec_end (),
1427 }; 1428 };
1428 while ((GNUNET_OK == GNUNET_BIO_read_string (rh, "url", &uri, MAX_URL_LEN)) && 1429 while ((GNUNET_OK == GNUNET_BIO_read_string (rh, "url", &uri, MAX_URL_LEN)) &&
@@ -1527,7 +1528,8 @@ save_hostlist_file (int shutdown)
1527 { 1528 {
1528 struct GNUNET_BIO_WriteSpec ws[] = { 1529 struct GNUNET_BIO_WriteSpec ws[] = {
1529 GNUNET_BIO_write_spec_string ("hostlist uri", pos->hostlist_uri), 1530 GNUNET_BIO_write_spec_string ("hostlist uri", pos->hostlist_uri),
1530 GNUNET_BIO_write_spec_int32 ("times used", (int32_t *) &pos->times_used), 1531 GNUNET_BIO_write_spec_int32 ("times used",
1532 (int32_t *) &pos->times_used),
1531 GNUNET_BIO_write_spec_int64 ("quality", (int64_t *) &pos->quality), 1533 GNUNET_BIO_write_spec_int64 ("quality", (int64_t *) &pos->quality),
1532 GNUNET_BIO_write_spec_int64 ( 1534 GNUNET_BIO_write_spec_int64 (
1533 "last usage", 1535 "last usage",