From: hadaq Date: Fri, 9 Jul 2010 16:48:23 +0000 (+0000) Subject: update X-Git-Tag: v6.0~250 X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=d32c2b06d6608eb86ec1583b009c89af68c05ea5;p=trbnettools.git update --- diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c index 1f98b4c..c982f4f 100644 --- a/libtrbnet/trbnet.c +++ b/libtrbnet/trbnet.c @@ -1,4 +1,4 @@ -const char trbnet_version[] = "$Revision: 2.67 $"; +const char trbnet_version[] = "$Revision: 2.68 $"; #include #include @@ -941,7 +941,9 @@ static int lockPorts(int masterLock) SEM_UNDO /* sem_flg: remove lock if process gets killed */ }; - if ((master_lock == 1) && (masterLock == 0)) return 0; + if ((master_lock == 1) && (masterLock == 0)) { + return 0; + } /* Wait for semaphore and lock it */ if (semop(semid, &sops, 1) == -1) { @@ -956,7 +958,7 @@ static int lockPorts(int masterLock) fifoToggleBit = readPC() & FIFO_TOGGLE_BIT; if (masterLock != 0) master_lock = 1; - + return 0; } @@ -967,8 +969,10 @@ static int unlockPorts(int masterLock) 1, /* sem_op: decrement semaphore, i.e. unlock it */ SEM_UNDO /* */ }; - - if ((master_lock == 1) && (masterLock == 0)) return 0; + + if ((master_lock == 1) && (masterLock == 0)) { + return 0; + } /* Release semaphore */ if (semop(semid, &sops, 1) == -1) {