Remove INT, LONG, BOOLEAN, STATIC, CONST, CHAR datatypes.

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

diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c
index 34da798c6f59b7687127560f5fe60b77d8f1ef6e..351c547a6e023be39352f4d420c85dacb82ab0d3 100644 (file)
--- a/src/ngircd/hash.c
+++ b/src/ngircd/hash.c
@@ -2,27 +2,25 @@
  * ngIRCd -- The Next Generation IRC Daemon
  * Copyright (c)2001,2002 by Alexander Barton (alex@barton.de)
  *
- * Dieses Programm ist freie Software. Sie koennen es unter den Bedingungen
- * der GNU General Public License (GPL), wie von der Free Software Foundation
- * herausgegeben, weitergeben und/oder modifizieren, entweder unter Version 2
- * der Lizenz oder (wenn Sie es wuenschen) jeder spaeteren Version.
- * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
- * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
+ * 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.
  *
- * $Id: hash.c,v 1.5 2002/05/27 12:54:07 alex Exp $
- *
- * hash.c: Hash-Werte berechnen
+ * Hash calculation
  */
 
 
 #include "portab.h"
 
+static char UNUSED id[] = "$Id: hash.c,v 1.11 2005/03/19 18:43:48 fw Exp $";
+
 #include "imp.h"
 #include <assert.h>
 #include <string.h>
 
 #include "defines.h"
-#include "log.h"
 #include "tool.h"
 
 #include "exp.h"
@@ -33,15 +31,13 @@ LOCAL UINT32 jenkins_hash PARAMS(( register UINT8 *k, register UINT32 length, re
 
 
 GLOBAL UINT32
-Hash( CHAR *String )
+Hash( char *String )
 {
        /* Hash-Wert ueber String berechnen */
 
-       CHAR buffer[LINE_LEN];
+       char buffer[LINE_LEN];
 
-       strncpy( buffer, String, LINE_LEN - 1 );
-       buffer[LINE_LEN - 1] = '\0';
-       
+       strlcpy( buffer, String, sizeof( buffer ));
        return jenkins_hash( (UINT8 *)ngt_LowerStr( buffer ), strlen( buffer ), 42 );
 } /* Hash */
 
@@ -103,7 +99,7 @@ jenkins_hash( register UINT8 *k, register UINT32 length, register UINT32 initval
 
        /* handle the last 11 bytes */
        c += length;
-       switch(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);