diff options
| author | Garrett D'Amore <garrett@damore.org> | 2017-01-16 16:27:22 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2017-01-16 16:27:22 -0800 |
| commit | ac8415c24ffea645105c3859e814843e81c97f8a (patch) | |
| tree | 7b64b4aab3de6ce5bdd69c3d5b7ead57f4a4b4e7 /src/protocol/pair | |
| parent | b8f7236aa2928d70d9bff2e1071654982539eeda (diff) | |
| download | nng-ac8415c24ffea645105c3859e814843e81c97f8a.tar.gz nng-ac8415c24ffea645105c3859e814843e81c97f8a.tar.bz2 nng-ac8415c24ffea645105c3859e814843e81c97f8a.zip | |
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.
Diffstat (limited to 'src/protocol/pair')
| -rw-r--r-- | src/protocol/pair/pair.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/protocol/pair/pair.c b/src/protocol/pair/pair.c index 0d8b32fe..d6c2eedf 100644 --- a/src/protocol/pair/pair.c +++ b/src/protocol/pair/pair.c @@ -64,7 +64,9 @@ nni_pair_sock_fini(void *arg) { nni_pair_sock *psock = arg; - NNI_FREE_STRUCT(psock); + if (psock != NULL) { + NNI_FREE_STRUCT(psock); + } } @@ -89,7 +91,9 @@ nni_pair_pipe_fini(void *arg) { nni_pair_pipe *ppipe = arg; - NNI_FREE_STRUCT(ppipe); + if (ppipe != NULL) { + NNI_FREE_STRUCT(ppipe); + } } |
