[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnunet] 02/05: fix more field initialziation order issues
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnunet] 02/05: fix more field initialziation order issues |
Date: |
Mon, 09 Jan 2017 07:38:40 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository gnunet.
commit 2ed3dc28ad297c3ced59142c1baf8258eedd3d11
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Jan 9 07:17:19 2017 +0100
fix more field initialziation order issues
---
src/cadet/gnunet-service-cadet_channel.c | 3 ++-
src/cadet/gnunet-service-cadet_tunnel.c | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/cadet/gnunet-service-cadet_channel.c
b/src/cadet/gnunet-service-cadet_channel.c
index 22349aa80..6f32bdc81 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -2495,17 +2495,18 @@ GCCH_send_prebuilt_message (const struct
GNUNET_MessageHeader *message,
}
}
+ chq->rel->uniq = chq;
chq->tq = GCT_send_prebuilt_message (message, ch->t, NULL, GNUNET_YES,
&ch_message_sent, chq);
if (NULL == chq->tq)
{
GNUNET_break (0);
+ chq->rel->uniq = NULL;
GCT_debug (ch->t, GNUNET_ERROR_TYPE_ERROR);
GNUNET_free (chq);
chq = NULL;
return;
}
- chq->rel->uniq = chq;
break;
diff --git a/src/cadet/gnunet-service-cadet_tunnel.c
b/src/cadet/gnunet-service-cadet_tunnel.c
index 5b07e42c0..6ddcf6598 100644
--- a/src/cadet/gnunet-service-cadet_tunnel.c
+++ b/src/cadet/gnunet-service-cadet_tunnel.c
@@ -1418,11 +1418,11 @@ send_prebuilt_message (const struct
GNUNET_MessageHeader *message,
tq = existing_q;
tq->tqd = NULL;
}
+ tq->cont = cont;
+ tq->cont_cls = cont_cls;
tq->cq = GCC_send_prebuilt_message (msg, type, mid, c, fwd, force,
&tun_message_sent, tq);
GNUNET_assert (NULL != tq->cq);
- tq->cont = cont;
- tq->cont_cls = cont_cls;
return tq;
}
--
To stop receiving notification emails like this one, please contact
address@hidden