Merge branch 't/makefile_cleanups'

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index 41c2ee1a690a82ebee2623c3f79efe21b8e364e2..a9eab006bd3cf0f0d4ddc6e5ac41ba6beb30199a 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -13,7 +13,6 @@
 
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 
 #include "para.h"
 #include "error.h"
@@ -39,20 +38,19 @@ struct private_dccp_recv_data {
        struct btr_pool *btrp;
 };
 
-
 static void dccp_recv_close(struct receiver_node *rn)
 {
-
        struct private_dccp_recv_data *pdd = rn->private_data;
 
-       if (pdd && pdd->fd > 0)
+       if (!pdd)
+               return;
+       if (pdd->fd > 0)
                close(pdd->fd);
        btr_pool_free(pdd->btrp);
-       free(rn->private_data);
+       free(pdd);
        rn->private_data = NULL;
 }
 
-
 static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;