diff options
Diffstat (limited to 'src/namestore')
-rw-r--r-- | src/namestore/gnunet-namestore.c | 24 | ||||
-rw-r--r-- | src/namestore/test_plugin_namestore.c | 6 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c index 5d292525e..2b814206b 100644 --- a/src/namestore/gnunet-namestore.c +++ b/src/namestore/gnunet-namestore.c | |||
@@ -437,7 +437,7 @@ display_record (const char *rname, | |||
437 | } | 437 | } |
438 | if (GNUNET_NO == have_record) | 438 | if (GNUNET_NO == have_record) |
439 | return; | 439 | return; |
440 | FPRINTF (stdout, "%s:\n", rname); | 440 | fprintf (stdout, "%s:\n", rname); |
441 | if (NULL != typestring) | 441 | if (NULL != typestring) |
442 | type = GNUNET_GNSRECORD_typename_to_number (typestring); | 442 | type = GNUNET_GNSRECORD_typename_to_number (typestring); |
443 | else | 443 | else |
@@ -455,7 +455,7 @@ display_record (const char *rname, | |||
455 | rd[i].data_size); | 455 | rd[i].data_size); |
456 | if (NULL == s) | 456 | if (NULL == s) |
457 | { | 457 | { |
458 | FPRINTF (stdout, | 458 | fprintf (stdout, |
459 | _ ("\tCorrupt or unsupported record of type %u\n"), | 459 | _ ("\tCorrupt or unsupported record of type %u\n"), |
460 | (unsigned int) rd[i].record_type); | 460 | (unsigned int) rd[i].record_type); |
461 | continue; | 461 | continue; |
@@ -470,7 +470,7 @@ display_record (const char *rname, | |||
470 | at.abs_value_us = rd[i].expiration_time; | 470 | at.abs_value_us = rd[i].expiration_time; |
471 | ets = GNUNET_STRINGS_absolute_time_to_string (at); | 471 | ets = GNUNET_STRINGS_absolute_time_to_string (at); |
472 | } | 472 | } |
473 | FPRINTF (stdout, | 473 | fprintf (stdout, |
474 | "\t%s: %s (%s)\t%s\t%s\n", | 474 | "\t%s: %s (%s)\t%s\t%s\n", |
475 | typestr, | 475 | typestr, |
476 | s, | 476 | s, |
@@ -481,7 +481,7 @@ display_record (const char *rname, | |||
481 | : ""); | 481 | : ""); |
482 | GNUNET_free (s); | 482 | GNUNET_free (s); |
483 | } | 483 | } |
484 | FPRINTF (stdout, "%s", "\n"); | 484 | fprintf (stdout, "%s", "\n"); |
485 | } | 485 | } |
486 | 486 | ||
487 | 487 | ||
@@ -564,7 +564,7 @@ static void | |||
564 | sync_cb (void *cls) | 564 | sync_cb (void *cls) |
565 | { | 565 | { |
566 | (void) cls; | 566 | (void) cls; |
567 | FPRINTF (stdout, "%s", "Monitor is now in sync.\n"); | 567 | fprintf (stdout, "%s", "Monitor is now in sync.\n"); |
568 | } | 568 | } |
569 | 569 | ||
570 | 570 | ||
@@ -577,7 +577,7 @@ static void | |||
577 | monitor_error_cb (void *cls) | 577 | monitor_error_cb (void *cls) |
578 | { | 578 | { |
579 | (void) cls; | 579 | (void) cls; |
580 | FPRINTF (stderr, "%s", "Monitor disconnected and out of sync.\n"); | 580 | fprintf (stderr, "%s", "Monitor disconnected and out of sync.\n"); |
581 | } | 581 | } |
582 | 582 | ||
583 | 583 | ||
@@ -591,7 +591,7 @@ lookup_error_cb (void *cls) | |||
591 | { | 591 | { |
592 | (void) cls; | 592 | (void) cls; |
593 | get_qe = NULL; | 593 | get_qe = NULL; |
594 | FPRINTF (stderr, "%s", "Failed to lookup record.\n"); | 594 | fprintf (stderr, "%s", "Failed to lookup record.\n"); |
595 | test_finished (); | 595 | test_finished (); |
596 | } | 596 | } |
597 | 597 | ||
@@ -761,7 +761,7 @@ reverse_error_cb (void *cls) | |||
761 | { | 761 | { |
762 | (void) cls; | 762 | (void) cls; |
763 | reverse_qe = NULL; | 763 | reverse_qe = NULL; |
764 | FPRINTF (stdout, "%s.zkey\n", reverse_pkey); | 764 | fprintf (stdout, "%s.zkey\n", reverse_pkey); |
765 | } | 765 | } |
766 | 766 | ||
767 | 767 | ||
@@ -788,9 +788,9 @@ handle_reverse_lookup (void *cls, | |||
788 | (void) rd; | 788 | (void) rd; |
789 | reverse_qe = NULL; | 789 | reverse_qe = NULL; |
790 | if (NULL == label) | 790 | if (NULL == label) |
791 | FPRINTF (stdout, "%s\n", reverse_pkey); | 791 | fprintf (stdout, "%s\n", reverse_pkey); |
792 | else | 792 | else |
793 | FPRINTF (stdout, "%s.%s\n", label, ego_name); | 793 | fprintf (stdout, "%s.%s\n", label, ego_name); |
794 | test_finished (); | 794 | test_finished (); |
795 | } | 795 | } |
796 | 796 | ||
@@ -837,7 +837,7 @@ del_monitor (void *cls, | |||
837 | del_qe = NULL; | 837 | del_qe = NULL; |
838 | if (0 == rd_count) | 838 | if (0 == rd_count) |
839 | { | 839 | { |
840 | FPRINTF (stderr, | 840 | fprintf (stderr, |
841 | _ ( | 841 | _ ( |
842 | "There are no records under label `%s' that could be deleted.\n"), | 842 | "There are no records under label `%s' that could be deleted.\n"), |
843 | label); | 843 | label); |
@@ -879,7 +879,7 @@ del_monitor (void *cls, | |||
879 | if (rd_count == rd_left) | 879 | if (rd_count == rd_left) |
880 | { | 880 | { |
881 | /* nothing got deleted */ | 881 | /* nothing got deleted */ |
882 | FPRINTF ( | 882 | fprintf ( |
883 | stderr, | 883 | stderr, |
884 | _ ( | 884 | _ ( |
885 | "There are no records under label `%s' that match the request for deletion.\n"), | 885 | "There are no records under label `%s' that match the request for deletion.\n"), |
diff --git a/src/namestore/test_plugin_namestore.c b/src/namestore/test_plugin_namestore.c index 0cb99dcb9..b4ed4c70d 100644 --- a/src/namestore/test_plugin_namestore.c +++ b/src/namestore/test_plugin_namestore.c | |||
@@ -73,7 +73,7 @@ load_plugin (const struct GNUNET_CONFIGURATION_Handle *cfg) | |||
73 | GNUNET_asprintf (&libname, "libgnunet_plugin_namestore_%s", plugin_name); | 73 | GNUNET_asprintf (&libname, "libgnunet_plugin_namestore_%s", plugin_name); |
74 | if (NULL == (ret = GNUNET_PLUGIN_load (libname, (void *) cfg))) | 74 | if (NULL == (ret = GNUNET_PLUGIN_load (libname, (void *) cfg))) |
75 | { | 75 | { |
76 | FPRINTF (stderr, "Failed to load plugin `%s'!\n", plugin_name); | 76 | fprintf (stderr, "Failed to load plugin `%s'!\n", plugin_name); |
77 | GNUNET_free (libname); | 77 | GNUNET_free (libname); |
78 | return NULL; | 78 | return NULL; |
79 | } | 79 | } |
@@ -159,7 +159,7 @@ run (void *cls, | |||
159 | nsp = load_plugin (cfg); | 159 | nsp = load_plugin (cfg); |
160 | if (NULL == nsp) | 160 | if (NULL == nsp) |
161 | { | 161 | { |
162 | FPRINTF ( | 162 | fprintf ( |
163 | stderr, | 163 | stderr, |
164 | "%s", | 164 | "%s", |
165 | "Failed to initialize namestore. Database likely not setup, skipping test.\n"); | 165 | "Failed to initialize namestore. Database likely not setup, skipping test.\n"); |
@@ -195,7 +195,7 @@ main (int argc, char *argv[]) | |||
195 | NULL); | 195 | NULL); |
196 | GNUNET_DISK_purge_cfg_dir (cfg_name, "GNUNET_TMP"); | 196 | GNUNET_DISK_purge_cfg_dir (cfg_name, "GNUNET_TMP"); |
197 | if (ok != 0) | 197 | if (ok != 0) |
198 | FPRINTF (stderr, "Missed some testcases: %d\n", ok); | 198 | fprintf (stderr, "Missed some testcases: %d\n", ok); |
199 | return ok; | 199 | return ok; |
200 | } | 200 | } |
201 | 201 | ||