Merge from disorder.dev.

[disorder] / lib / hash.c

diff --git a/lib/hash.c b/lib/hash.c
index 2fc19c186adfc879c6e9406ae99ca672a5349568..d507d0a376b86473125843720e2062bce3dd6d19 100644 (file)
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -1,31 +1,29 @@
 /*
  * This file is part of DisOrder
- * Copyright (C) 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2005-2008 Richard Kettlewell
  *
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include <config.h>
-#include "types.h"
-
-#include <string.h>
+/** @file lib/hash.c
+ * @brief A simple hash table
+ */
+#include "common.h"
 
 #include "hash.h"
 #include "mem.h"
 #include "log.h"
+#include "kvp.h"
 
 struct entry {
   struct entry *next;                   /* next entry same key */
@@ -171,4 +169,3 @@ fill-column:79
 indent-tabs-mode:nil
 End:
 */
-/* arch-tag:8JLNu2iwue7D0MlS0/nR2g */