Pull compiler warning cleanup code + other from master

[bacula/bacula] / bacula / src / lib / res.c

diff --git a/bacula/src/lib/res.c b/bacula/src/lib/res.c
index 886f1a220b79119eafe5a63391fa26a20581b105..bb7e63aa721a5297bab7cd1075990ae8f21d3bc4 100644 (file)
--- a/bacula/src/lib/res.c
+++ b/bacula/src/lib/res.c
@@ -1,20 +1,12 @@
-/*
- *  This file handles locking and seaching resources
- *
- *     Kern Sibbald, January MM
- *       Split from parse_conf.c April MMV
- *
- *   Version $Id$
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
    This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
+   modify it under the terms of version three of the GNU Affero General Public
    License as published by the Free Software Foundation and included
    in the file LICENSE.
 
@@ -23,16 +15,23 @@
    MERCHANTABILITY or 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
+   You should have received a copy of the GNU Affero General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark of John Walker.
+   Bacula® is a registered trademark of Kern Sibbald.
    The licensor of Bacula is the Free Software Foundation Europe
    (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
    Switzerland, email:ftf@fsfeurope.org.
 */
+/*
+ *  This file handles locking and seaching resources
+ *
+ *     Kern Sibbald, January MM
+ *       Split from parse_conf.c April MMV
+ *
+ */
 
 #include "bacula.h"
 
@@ -40,13 +39,13 @@
  * resources, so it will define the following
  * global values.
  */
-extern int r_first;
-extern int r_last;
+extern int32_t r_first;
+extern int32_t r_last;
 extern RES_TABLE resources[];
 extern RES **res_head;
 
 brwlock_t res_lock;                   /* resource lock */
-static int res_locked = 0;            /* set when resource chains locked -- for debug */
+static int res_locked = 0;            /* resource chain lock count -- for debug */
 
 
 /* #define TRACE_RES */