MonetDB: Jun2016 - Avoid closing twice.

[Sjoerd Mullender]

Changeset: 29cb8a8cc6d2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=29cb8a8cc6d2
Modified Files:
        tools/merovingian/daemon/merovingian.c
        tools/merovingian/daemon/multiplex-funnel.c
Branch: Jun2016
Log Message:

Avoid closing twice.


diffs (46 lines):

diff --git a/tools/merovingian/daemon/merovingian.c 
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -966,6 +966,7 @@ main(int argc, char *argv[])
                        Mfprintf(stderr, "unable to create control command 
thread: %s\n",
                                        strerror(thret));
                        ctid = 0;
+                       close(unsock);
                }
 
                /* start neighbour discovery and notification thread */ 
@@ -982,7 +983,6 @@ main(int argc, char *argv[])
 
                /* wait for the control runner and discovery thread to have
                 * finished announcing they're going down */
-               close(unsock);
                if (ctid != 0)
                        pthread_join(ctid, NULL);
                if (usock >= 0) {
diff --git a/tools/merovingian/daemon/multiplex-funnel.c 
b/tools/merovingian/daemon/multiplex-funnel.c
--- a/tools/merovingian/daemon/multiplex-funnel.c
+++ b/tools/merovingian/daemon/multiplex-funnel.c
@@ -781,7 +781,6 @@ multiplexThread(void *d)
                c = m->clients;
                close_stream(c->fdin);
                close_stream(c->fout);
-               close(c->sock);
                free(c->name);
                m->clients = m->clients->next;
                free(c);
@@ -858,7 +857,6 @@ multiplexAddClient(char *mp, int sock, s
                mnstr_flush(fout);
                close_stream(fdin);
                close_stream(fout);
-               close(sock);
                free(n);
                return;
        }
@@ -896,7 +894,6 @@ multiplexRemoveClient(multiplex *m, mult
                        c->next = NULL;
                        close_stream(c->fdin);
                        close_stream(c->fout);
-                       close(c->sock);
                        free(c->name);
                        free(c);
                        break;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list