kes Apply Marco van Wieringen's set of patches, cleans up Migration/Copy

[bacula/bacula] / bacula / src / lib / smartall.h

diff --git a/bacula/src/lib/smartall.h b/bacula/src/lib/smartall.h
index b178663b05fee2ad7b5f2d76badd72e8db22a4c9..734b9100908c1d3f8505b92af4d4576506431f18 100644 (file)
--- a/bacula/src/lib/smartall.h
+++ b/bacula/src/lib/smartall.h
@@ -1,14 +1,14 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2008 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
-   License as published by the Free Software Foundation plus additions
-   that are listed in the file LICENSE.
+   License as published by the Free Software Foundation and included
+   in the file LICENSE.
 
    This program is distributed in the hope that it will be useful, but
    WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,7 +20,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark ofJohn 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.
@@ -60,7 +60,7 @@ extern void sm_new_owner(const char *fname, int lineno, char *buf);
 extern void sm_check(const char *fname, int lineno, bool bufdump);
 extern int sm_check_rtn(const char *fname, int lineno, bool bufdump);
 #else
-#define Dsm_check(lvl, f, l, fl)
+#define Dsm_check(lvl)
 #define sm_check(f, l, fl)
 #define sm_check_rtn(f, l, fl) 1
 #endif
@@ -99,7 +99,6 @@ extern void *b_malloc();
 #endif
 
 #ifdef SMARTALLOC
-// #ifdef xxx
 
 #define New(type) new(__FILE__, __LINE__) type
 
@@ -121,20 +120,17 @@ void  operator delete(void *ptr)
 {
    free(ptr);
 }
-void  operator delete[](void *ptr, size_t i)
+void  operator delete[](void *ptr, size_t /*i*/)
 {
-   (void)i;                           /* eliminate compiler complaints */
    free(ptr);
 }
 
-void  operator delete(void *ptr, const char *fname, int line)
+void  operator delete(void *ptr, const char * /*fname*/, int /*line*/)
 {
-   (void)fname; (void)line;          /* eliminate compiler complaints */
    free(ptr);
 }
-void  operator delete[](void *ptr, size_t i, const char *fname, int line)
+void  operator delete[](void *ptr, size_t /*i*/, const char * /*fname*/, int /*line*/)
 {
-   (void)i; (void)fname; (void)line; /* eliminate compiler complaints */
    free(ptr);
 }