Rocco Rutte:

[apps/madmutt.git] / hash.c

diff --git a/hash.c b/hash.c
index a2dc11e..63775bb 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -1,19 +1,10 @@
 /*
+ * Copyright notice from original mutt:
  * Copyright (C) 1996-2000 Michael R. Elkins <me@mutt.org>
  *
- *     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
- *     (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.
- * 
- *     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, USA.
+ * This file is part of mutt-ng, see http://www.muttng.org/.
+ * It's licensed under the GNU General Public License,
+ * please see the file GPL in the top level source directory.
  */
 
 #if HAVE_CONFIG_H
@@ -26,6 +17,8 @@
 
 #include "mutt.h"
 
+#include "lib/mem.h"
+
 #define SOMEPRIME 149711
 
 int hash_string (const unsigned char *s, int n)
@@ -104,7 +97,7 @@ int hash_insert (HASH * table, const char *key, void *data, int allow_dup)
     int r;
 
     for (tmp = table->table[h], last = NULL; tmp; last = tmp, tmp = tmp->next) {
-      r = mutt_strcmp (tmp->key, key);
+      r = safe_strcmp (tmp->key, key);
       if (r == 0) {
         FREE (&ptr);
         return (-1);
@@ -127,7 +120,7 @@ void *hash_find_hash (const HASH * table, int hash, const char *key)
   struct hash_elem *ptr = table->table[hash];
 
   for (; ptr; ptr = ptr->next) {
-    if (mutt_strcmp (key, ptr->key) == 0)
+    if (safe_strcmp (key, ptr->key) == 0)
       return (ptr->data);
   }
   return NULL;
@@ -144,7 +137,7 @@ void hash_delete_hash (HASH * table, int hash, const char *key,
      * required for the case where we have multiple entries with the same
      * key
      */
-    if ((data == ptr->data) || (!data && mutt_strcmp (ptr->key, key) == 0)) {
+    if ((data == ptr->data) || (!data && safe_strcmp (ptr->key, key) == 0)) {
       *last = ptr->next;
       if (destroy)
         destroy (ptr->data);