Move "ClientHost" and "ClientUserNick" to end of [Global] section

[ngircd-alex.git] / src / ngircd / hash.c

diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c
index 820c8f684adcd1ebf85969718b6c277d78850aa6..113133d20c7f75019b35297aba13904cf32e4c79 100644 (file)
--- a/src/ngircd/hash.c
+++ b/src/ngircd/hash.c
@@ -1,61 +1,62 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
  *
  * 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.
  * Please read the file COPYING, README and AUTHORS for more information.
- *
- * Hash calculation
  */
 
-
 #include "portab.h"
 
-static char UNUSED id[] = "$Id: hash.c,v 1.9 2002/12/26 16:25:43 alex Exp $";
+/**
+ * @file
+ * Hash calculation
+ */
 
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
 
 #include "defines.h"
-#include "log.h"
 #include "tool.h"
 
 #include "exp.h"
 #include "hash.h"
 
+static UINT32 jenkins_hash PARAMS((register UINT8 *k, register UINT32 length,
+                                  register UINT32 initval));
 
-LOCAL UINT32 jenkins_hash PARAMS(( register UINT8 *k, register UINT32 length, register UINT32 initval ));
-
-
+/**
+ * Calculate hash value for a given string.
+ *
+ * @param String Input string
+ * @return 32 bit hash value
+ */
 GLOBAL UINT32
-Hash( CHAR *String )
+Hash( const char *String )
 {
-       /* Hash-Wert ueber String berechnen */
+       char buffer[LINE_LEN];
 
-       CHAR buffer[LINE_LEN];
-
-       strlcpy( buffer, String, sizeof( buffer ));
-       return jenkins_hash( (UINT8 *)ngt_LowerStr( buffer ), strlen( buffer ), 42 );
+       strlcpy(buffer, String, sizeof(buffer));
+       return jenkins_hash((UINT8 *)ngt_LowerStr(buffer),
+                           (UINT32)strlen(buffer), 42);
 } /* Hash */
 
-
 /*
- * Die hier verwendete Hash-Funktion stammt aus lookup2.c von Bob Jenkins
- * (URL: <http://burtleburtle.net/bob/c/lookup2.c>). Aus dem Header:
+ * This hash function originates from lookup2.c of Bob Jenkins
+ * (URL: <http://burtleburtle.net/bob/c/lookup2.c>):
  * --------------------------------------------------------------------
  * lookup2.c, by Bob Jenkins, December 1996, Public Domain.
  * hash(), hash2(), hash3, and mix() are externally useful functions.
  * Routines to test the hash are included if SELF_TEST is defined.
  * You can use this free for any purpose.  It has no warranty.
  * --------------------------------------------------------------------
- * nicht alle seiner Funktionen werden hier genutzt.
+ * Not all of his functions are used here.
  */
 
-
 #define hashsize(n) ((UINT32)1<<(n))
 #define hashmask(n) (hashsize(n)-1)
 
@@ -72,8 +73,7 @@ Hash( CHAR *String )
        c -= a; c -= b; c ^= (b>>15); \
 } /* mix */
 
-
-LOCAL UINT32
+static UINT32
 jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval )
 {
        /* k: the key
@@ -100,7 +100,7 @@ jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval
 
        /* handle the last 11 bytes */
        c += length;
-       switch( (INT)len )      /* all the case statements fall through */
+       switch( (int)len )      /* all the case statements fall through */
        {
                case 11: c+=((UINT32)k[10]<<24);
                case 10: c+=((UINT32)k[9]<<16);
@@ -122,5 +122,4 @@ jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval
        return c;
 } /* jenkins_hash */
 
-
 /* -eof- */