update copyrights and fix compiler warnings

chrisboulton · Jan 24, 2011 · c72a140 · c72a140
1 parent 3b5c24f
commit c72a140
Show file tree

Hide file tree

Showing 86 changed files with 92 additions and 93 deletions.
diff --git a/README b/README
@@ -1,6 +1,6 @@
 /* 
    (c) 2000-2005 IC&S, The Netherlands
-   (c) 2004-2010 NFG Net Facilities Group BV, The Netherlands, support@nfg.nl
+   (c) 2004-2011 NFG Net Facilities Group BV, The Netherlands, support@nfg.nl
 */
 
 What is it?

diff --git a/THANKS b/THANKS
@@ -5,7 +5,8 @@ and Ilja Booij. Development since 2.0 is led by Paul J Stevens and
 Aaron Stone.
 
 Special thanks to Metaways.net for providing resources so dbmail runs
-on Solaris, and to InternetConnection.net for providing the sqlite driver.
+on Solaris, and to InternetConnection.net for providing the original
+sqlite driver.
 
 Many people further contributed to DBMail by reporting problems, 
 suggesting various improvements and submitting code patches.

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,5 +1,5 @@
 # Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
-# Copyright (c) 2004-2006 NFG Net Facilities Group BV support@nfg.nl
+# Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 #
 # This program is free software; you can redistribute it and/or 
 # modify it under the terms of the GNU General Public License 

diff --git a/src/clientbase.c b/src/clientbase.c
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/clientbase.h b/src/clientbase.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/clientsession.c b/src/clientsession.c
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 2004 IC & S dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/clientsession.h b/src/clientsession.h
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 2004 IC & S dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dbmail-imapsession.c b/src/dbmail-imapsession.c
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dbmail-imapsession.h b/src/dbmail-imapsession.h
@@ -1,6 +1,6 @@
 /*
  *
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
  *
  */
 

diff --git a/src/dbmail-mailbox.c b/src/dbmail-mailbox.c
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
   This program is free software; you can redistribute it and/or 
   modify it under the terms of the GNU General Public License 
@@ -1356,8 +1356,7 @@ GTree * dbmail_mailbox_get_set(DbmailMailbox *self, const char *set, gboolean ui
 	GString *t;
 	GTree *uids;
 	char *rest;
-	u64_t i, l, r, lo = 0, hi = 0, maxmsn = 0;
-	u64_t *k, *v, *w = NULL;
+	u64_t l, r, lo = 0, hi = 0, maxmsn = 0;
 	GTree *a, *b, *c;
 	gboolean error = FALSE;
 

diff --git a/src/dbmail-mailbox.h b/src/dbmail-mailbox.h
@@ -1,7 +1,7 @@
 /*
  * 
  
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dbmail-message.c b/src/dbmail-message.c
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
   This program is free software; you can redistribute it and/or 
   modify it under the terms of the GNU General Public License 

diff --git a/src/dbmail-message.h b/src/dbmail-message.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dbmail-user.c b/src/dbmail-user.c
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dbmail-user.h b/src/dbmail-user.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dbmail.h.in b/src/dbmail.h.in
@@ -1,7 +1,7 @@
 /*
  Copyright (C) 1999-2004 IC & S, dbmail@ic-s.nl
  Copyright (C) 2001-2007 Aaron Stone, aaron@serendipity.cx
- Copyright (C) 2004-2007 NFG Net Facilities Group BV, support@nfg.nl
+ Copyright (C) 2004-2011 NFG Net Facilities Group BV, support@nfg.nl
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License as
@@ -163,7 +163,7 @@
 #define COPYRIGHT \
 "Copyright (C) 1999-2004 IC & S, dbmail@ic-s.nl\n" \
 "Copyright (C) 2001-2007 Aaron Stone, aaron@serendipity.cx\n" \
-"Copyright (C) 2004-2008 NFG Net Facilities Group BV, support@nfg.nl\n" \
+"Copyright (C) 2004-2011 NFG Net Facilities Group BV, support@nfg.nl\n" \
 "\n" \
 "Please see the AUTHORS and THANKS files for additional contributors.\n" \
 "\n" \

diff --git a/src/dbmailtypes.h b/src/dbmailtypes.h
@@ -1,7 +1,7 @@
 /*
 
  Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_acl.c b/src/dm_acl.c
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_cache.c b/src/dm_cache.c
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_cache.h b/src/dm_cache.h
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_capa.c b/src/dm_capa.c
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2008 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2009-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_capa.h b/src/dm_capa.h
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2009-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_cidr.c b/src/dm_cidr.c
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_cidr.h b/src/dm_cidr.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_config.c b/src/dm_config.c
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_config.h b/src/dm_config.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_cram.c b/src/dm_cram.c
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2008 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2008-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_cram.h b/src/dm_cram.h
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2008 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2008-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_db.c b/src/dm_db.c
@@ -1,7 +1,7 @@
 /*  */
 /*
   Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
   This program is free software; you can redistribute it and/or 
   modify it under the terms of the GNU General Public License 

diff --git a/src/dm_db.h b/src/dm_db.h
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_debug.c b/src/dm_debug.c
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_debug.h b/src/dm_debug.h
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_digest.c b/src/dm_digest.c
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_http.c b/src/dm_http.c
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2008 NFG Net Facilities Group BV, support@nfg.nl
+ Copyright (C) 2008-2011 NFG Net Facilities Group BV, support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_http.h b/src/dm_http.h
@@ -1,6 +1,6 @@
 
 /*
- Copyright (C) 2008 NFG Net Facilities Group BV, support@nfg.nl
+ Copyright (C) 2008-2011 NFG Net Facilities Group BV, support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_iconv.c b/src/dm_iconv.c
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_iconv.h b/src/dm_iconv.h
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_list.c b/src/dm_list.c
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_list.h b/src/dm_list.h
@@ -1,6 +1,6 @@
 /*
  Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_mailboxstate.c b/src/dm_mailboxstate.c
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_mailboxstate.h b/src/dm_mailboxstate.h
@@ -1,6 +1,6 @@
 /*
   
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_match.c b/src/dm_match.c
@@ -119,7 +119,7 @@ char *match_glob(char *pattern, char *candidate)
 			int j;
 
 			for (j = 0; j < len; j++) {
-				if (strncmp(parts[i], can + j, CLAMP(plen, plen, len - j)) == 0) {
+				if (strncmp(parts[i], can + j, MIN(plen, len - j)) == 0) {
 					can += CLAMP(plen + j, plen, len);
 					has_star = 0;
 					break;
@@ -138,7 +138,7 @@ char *match_glob(char *pattern, char *candidate)
 			int j;
 
 			for (j = 0; j <= has_question; j++) {
-				if (strncmp(parts[i], can + j, CLAMP(plen, plen, len - j)) == 0) {
+				if (strncmp(parts[i], can + j, MIN(plen, len-j)) == 0) {
 					can += CLAMP(plen + j, plen, len);
 					has_question = 0;
 					break;
@@ -153,8 +153,8 @@ char *match_glob(char *pattern, char *candidate)
 		}
 
 		// This is for normal matching.
-		if (strncmp(parts[i], can, CLAMP(plen, plen, len)) == 0) {
-			can += CLAMP(plen, plen, len);
+		if (strncmp(parts[i], can, MIN(plen, len)) == 0) {
+			can += MIN(plen, len);
 			continue;
 		}
 

diff --git a/src/dm_memblock.c b/src/dm_memblock.c
@@ -1,6 +1,6 @@
  /*
  Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License 

diff --git a/src/dm_memblock.h b/src/dm_memblock.h
@@ -1,7 +1,7 @@
  /*
 
  Copyright (C) 1999-2004 IC & S  dbmail@ic-s.nl
- Copyright (c) 2004-2010 NFG Net Facilities Group BV support@nfg.nl
+ Copyright (c) 2004-2011 NFG Net Facilities Group BV support@nfg.nl
 
  This program is free software; you can redistribute it and/or 
  modify it under the terms of the GNU General Public License