From ac8415c24ffea645105c3859e814843e81c97f8a Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Mon, 16 Jan 2017 16:27:22 -0800 Subject: Start of event framework. This compiles correctly, but doesn't actually deliver events yet. As part of this, I've made most of the initializables in nng safe to tear-down if uninitialized (or set to zero e.g. via calloc). This makes it loads easier to write the teardown on error code, since I can deinit everything, without worrying about which things have been initialized and which have not. --- src/protocol/survey/survey.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/protocol/survey/survey.c') diff --git a/src/protocol/survey/survey.c b/src/protocol/survey/survey.c index 22baf2e8..c7ce1c16 100644 --- a/src/protocol/survey/survey.c +++ b/src/protocol/survey/survey.c @@ -82,8 +82,10 @@ nni_surv_sock_fini(void *arg) { nni_surv_sock *psock = arg; - nni_cv_fini(&psock->cv); - NNI_FREE_STRUCT(psock); + if (psock != NULL) { + nni_cv_fini(&psock->cv); + NNI_FREE_STRUCT(psock); + } } @@ -114,7 +116,9 @@ nni_surv_pipe_fini(void *arg) { nni_surv_pipe *sp = arg; - NNI_FREE_STRUCT(sp); + if (sp != NULL) { + NNI_FREE_STRUCT(sp); + } } -- cgit v1.2.3-70-g09d2