MonetDB: Jan2014 - Initialize lockfd to make compiler happy.

[Sjoerd Mullender]

Changeset: 1c41cc1489e4 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1c41cc1489e4
Modified Files:
        tools/merovingian/daemon/merovingian.c
Branch: Jan2014
Log Message:

Initialize lockfd to make compiler happy.


diffs (25 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
@@ -404,7 +404,7 @@ main(int argc, char *argv[])
        pthread_t tid = 0;
        struct sigaction sa;
        int ret;
-       int lockfd;
+       int lockfd = -1;
        int sock = -1;
        int usock = -1;
        int unsock = -1;
@@ -1062,8 +1062,10 @@ shutdown:
                free(_mero_db_props);
        }
 
-       MT_lockf(".merovingian_lock", F_ULOCK, 4, 1);
-       close(lockfd);
+       if (lockfd >= 0) {
+               MT_lockf(".merovingian_lock", F_ULOCK, 4, 1);
+               close(lockfd);
+       }
 
        /* the child's return code at this point doesn't matter, as noone
         * will see it */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list