Annotate "fall through" cases to silence warnings

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

diff --git a/src/ngircd/hash.c b/src/ngircd/hash.c
index 7b7976c9a330ac29e63135215ba96429e4f02505..c078443bbd0c2168ceb68b0690ef482eeb5a1739 100644 (file)
--- a/src/ngircd/hash.c
+++ b/src/ngircd/hash.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de)
+ * Copyright (c)2001-2014 Alexander Barton (alex@barton.de) and Contributors.
  *
  * 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
@@ -16,14 +16,12 @@
  * Hash calculation
  */
 
-#include "imp.h"
 #include <assert.h>
 #include <string.h>
 
 #include "defines.h"
 #include "tool.h"
 
-#include "exp.h"
 #include "hash.h"
 
 static UINT32 jenkins_hash PARAMS((UINT8 *k, UINT32 length, UINT32 initval));
@@ -37,7 +35,7 @@ static UINT32 jenkins_hash PARAMS((UINT8 *k, UINT32 length, UINT32 initval));
 GLOBAL UINT32
 Hash( const char *String )
 {
-       char buffer[LINE_LEN];
+       char buffer[COMMAND_LEN];
 
        strlcpy(buffer, String, sizeof(buffer));
        return jenkins_hash((UINT8 *)ngt_LowerStr(buffer),
@@ -58,7 +56,7 @@ Hash( const char *String )
  * Not all of his functions are used here.
  */
 
-#define hashsize(n) ((uint32_t)1<<(n))
+#define hashsize(n) ((UINT32)1<<(n))
 #define hashmask(n) (hashsize(n)-1)
 #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k))))
 
@@ -110,16 +108,27 @@ jenkins_hash(UINT8 *k, UINT32 length, UINT32 initval)
 
        {
                case 12: c+=((UINT32)k[11])<<24;
+               /* fall through */
                case 11: c+=((UINT32)k[10]<<16);
+               /* fall through */
                case 10: c+=((UINT32)k[9]<<8);
+               /* fall through */
                case 9 : c+=k[8];
+               /* fall through */
                case 8 : b+=((UINT32)k[7]<<24);
+               /* fall through */
                case 7 : b+=((UINT32)k[6]<<16);
+               /* fall through */
                case 6 : b+=((UINT32)k[5]<<8);
+               /* fall through */
                case 5 : b+=k[4];
+               /* fall through */
                case 4 : a+=((UINT32)k[3]<<24);
+               /* fall through */
                case 3 : a+=((UINT32)k[2]<<16);
+               /* fall through */
                case 2 : a+=((UINT32)k[1]<<8);
+               /* fall through */
                case 1 : a+=k[0];
                         break;
                case 0 : return c;