diff options
| -rw-r--r-- | src/lib/cdap.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/lib/cdap.c b/src/lib/cdap.c index 5dc050a4..df2128a0 100644 --- a/src/lib/cdap.c +++ b/src/lib/cdap.c @@ -230,12 +230,10 @@ struct cdap * cdap_create(struct cdap_ops * ops, int cdap_destroy(struct cdap * instance) { if (instance == NULL) - return -1; + return 0; pthread_cancel(instance->reader); - - if (flow_dealloc(instance->fd)) - return -1; + pthread_join(instance->reader, NULL); pthread_mutex_lock(&instance->ids_lock); @@ -243,8 +241,7 @@ int cdap_destroy(struct cdap * instance) pthread_mutex_unlock(&instance->ids_lock); - pthread_join(instance->reader, - NULL); + flow_dealloc(instance->fd); free(instance); |