aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2021-11-22 09:26:55 +0100
committerChristian Grothoff <christian@grothoff.org>2021-11-22 09:26:55 +0100
commit925886ed8eea8342c7d7a94b5250fff2f421f60f (patch)
tree14196c364b724351b645566bb0d5a1582fe133c5 /src/util
parent71d0c6696d2b2f1293bea1fc735d885913da6d8a (diff)
downloadgnunet-925886ed8eea8342c7d7a94b5250fff2f421f60f.tar.gz
gnunet-925886ed8eea8342c7d7a94b5250fff2f421f60f.zip
-fixes
Diffstat (limited to 'src/util')
-rw-r--r--src/util/mq.c6
-rw-r--r--src/util/program.c11
2 files changed, 12 insertions, 5 deletions
diff --git a/src/util/mq.c b/src/util/mq.c
index 9b59cd338..b09837459 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -273,7 +273,7 @@ GNUNET_MQ_handle_message (const struct GNUNET_MQ_MessageHandler *handlers,
273 break; 273 break;
274 } 274 }
275 } 275 }
276 done: 276done:
277 if (GNUNET_NO == handled) 277 if (GNUNET_NO == handled)
278 { 278 {
279 LOG (GNUNET_ERROR_TYPE_INFO, 279 LOG (GNUNET_ERROR_TYPE_INFO,
@@ -670,7 +670,9 @@ GNUNET_MQ_msg_copy (const struct GNUNET_MessageHeader *hdr)
670 670
671 mqm = GNUNET_malloc (sizeof(*mqm) + size); 671 mqm = GNUNET_malloc (sizeof(*mqm) + size);
672 mqm->mh = (struct GNUNET_MessageHeader *) &mqm[1]; 672 mqm->mh = (struct GNUNET_MessageHeader *) &mqm[1];
673 GNUNET_memcpy (mqm->mh, hdr, size); 673 GNUNET_memcpy (mqm->mh,
674 hdr,
675 size);
674 return mqm; 676 return mqm;
675} 677}
676 678
diff --git a/src/util/program.c b/src/util/program.c
index b9da14572..08effa19b 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -89,9 +89,13 @@ program_main (void *cls)
89 struct CommandContext *cc = cls; 89 struct CommandContext *cc = cls;
90 90
91 GNUNET_SPEEDUP_start_ (cc->cfg); 91 GNUNET_SPEEDUP_start_ (cc->cfg);
92 GNUNET_SCHEDULER_add_shutdown (&shutdown_task, NULL); 92 GNUNET_SCHEDULER_add_shutdown (&shutdown_task,
93 NULL);
93 GNUNET_RESOLVER_connect (cc->cfg); 94 GNUNET_RESOLVER_connect (cc->cfg);
94 cc->task (cc->task_cls, cc->args, cc->cfgfile, cc->cfg); 95 cc->task (cc->task_cls,
96 cc->args,
97 cc->cfgfile,
98 cc->cfg);
95} 99}
96 100
97 101
@@ -103,7 +107,8 @@ program_main (void *cls)
103 * @param a2 second command line option 107 * @param a2 second command line option
104 */ 108 */
105static int 109static int
106cmd_sorter (const void *a1, const void *a2) 110cmd_sorter (const void *a1,
111 const void *a2)
107{ 112{
108 const struct GNUNET_GETOPT_CommandLineOption *c1 = a1; 113 const struct GNUNET_GETOPT_CommandLineOption *c1 = a1;
109 const struct GNUNET_GETOPT_CommandLineOption *c2 = a2; 114 const struct GNUNET_GETOPT_CommandLineOption *c2 = a2;