Fixed several prototypes.. Most changes are f() to f(void).

[idzebra-moved-to-github.git] / util / flock.c

diff --git a/util/flock.c b/util/flock.c
index 330fbf7..704103c 100644 (file)
--- a/util/flock.c
+++ b/util/flock.c
@@ -1,4 +1,4 @@
-/* $Id: flock.c,v 1.17 2006-07-05 12:02:12 adam Exp $
+/* $Id: flock.c,v 1.20 2006-10-29 17:20:02 adam Exp $
    Copyright (C) 1995-2006
    Index Data ApS
 
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -250,7 +250,7 @@ static int unixLock(int fd, int type, int cmd)
 
 int zebra_lock_w(ZebraLockHandle h)
 {
-    int r;
+    int r = 0;
     int do_lock = 0;
     yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s begin", 
             h->p->fd, h, h->p->fname);
@@ -287,7 +287,7 @@ int zebra_lock_w(ZebraLockHandle h)
 
 int zebra_lock_r(ZebraLockHandle h)
 {
-    int r;
+    int r = 0;
     int do_lock = 0;
 
     yaz_log(log_level, "zebra_lock_r fd=%d p=%p fname=%s begin", 
@@ -368,7 +368,7 @@ int zebra_unlock(ZebraLockHandle h)
  * The default posix_locks=1 is assumed.. This function sets posix_locks
  * to zero if linuxthreads is in use.
  */
-static int check_for_linuxthreads()
+static int check_for_linuxthreads(void)
 {
 #if __linux
 #ifdef _CS_GNU_LIBPTHREAD_VERSION