From: Bart Polot Date: Tue, 19 Nov 2013 15:32:04 +0000 (+0000) Subject: - fix shutdown order X-Git-Tag: initial-import-from-subversion-38251~5997 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=98f57354c839ba6a8b76aaaf7301edc75b712c43;p=oweals%2Fgnunet.git - fix shutdown order --- diff --git a/src/mesh/gnunet-service-mesh.c b/src/mesh/gnunet-service-mesh.c index 214fc90fc..1f8a58b60 100644 --- a/src/mesh/gnunet-service-mesh.c +++ b/src/mesh/gnunet-service-mesh.c @@ -100,9 +100,9 @@ shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) GML_shutdown (); GMD_shutdown (); - GMP_shutdown (); GMC_shutdown (); GMT_shutdown (); + GMP_shutdown (); GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "shut down\n"); } diff --git a/src/mesh/gnunet-service-mesh_tunnel.c b/src/mesh/gnunet-service-mesh_tunnel.c index 0cb269427..1b4e717ca 100644 --- a/src/mesh/gnunet-service-mesh_tunnel.c +++ b/src/mesh/gnunet-service-mesh_tunnel.c @@ -1644,7 +1644,6 @@ GMT_destroy (struct MeshTunnel3 *t) struct MeshTChannel *iter_ch; struct MeshTChannel *next_ch; - if (NULL == t) return;