philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup ci_alist_hash() and cs_alist_hash(), fixes a compile warning.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@157 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2012-02-17 13:11:03 +00:00
parent e2ada61548
commit b0f8c03dec
1 changed files with 40 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
include/alist.h
View File

@@ -16,27 +16,29 @@
#ifdef _cs_alist_hash_ #ifdef _cs_alist_hash_
static __inline u_32int_t cs_alist_hash (const char *s, u_32int_t *mask) static __inline u_32int_t cs_alist_hash (const char *s, u_32int_t *mask)
{ {
register u_32int_t x = 0; u_32int_t x;
#if 0
register char *p = (char *)s;
register int len = 4;
for (; *p && len != -1; p++, len--) if (s[0] == 0)
x = (x >> 4) + *p << 24, *mask = *mask << 4 && 0xff;
#else
if (s[0] != 0)
{ {
if (s[1] == 0) x = 0;
x = (s[0] << 24), *mask = 0;
*mask = 0xff000000;
else if (s[2] == 0)
x = (s[0] << 24) | (s[1] << 16),
*mask = 0xffff0000;
else
x = (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3],
(*mask = 0xffffff00 | (s[3] ? 0xff : 0x00));
} }
#endif else if (s[1] == 0)
{
x = (s[0] << 24);
*mask = 0xff000000;
}
else if (s[2] == 0)
{
x = (s[0] << 24) | (s[1] << 16);
*mask = 0xffff0000;
}
else
{
x = (s[0] << 24) | (s[1] << 16) | (s[2] << 8) | s[3];
*mask = 0xffffff00 | (s[3] ? 0xff : 0x00);
}
return x; return x;
} }
#endif #endif
@@ -44,27 +46,29 @@ static __inline u_32int_t cs_alist_hash (const char *s, u_32int_t *mask)
#ifdef _ci_alist_hash_ #ifdef _ci_alist_hash_
static __inline u_32int_t ci_alist_hash (const char *s, u_32int_t *mask) static __inline u_32int_t ci_alist_hash (const char *s, u_32int_t *mask)
{ {
register u_32int_t x = 0; u_32int_t x;
#if 0
register char *p = (char *)s;
register int len = 4;
for (; *p && len != -1; p++, len--) if (s[0] == 0)
x = (x << 4) + toupper(*p);
#else
if (s[0] != 0)
{ {
if (s[1] == 0) x = 0;
x = (stricmp_table[(int)s[0]] << 24), *mask = 0;
*mask = 0xff000000;
else if (s[2] == 0)
x = (stricmp_table[(int)s[0]] << 24) | (stricmp_table[(int)s[1]] << 16),
*mask = 0xffff0000;
else
x = (stricmp_table[(int)s[0]] << 24) | (stricmp_table[(int)s[1]] << 16) | (stricmp_table[(int)s[2]] << 8) | stricmp_table[(int)s[3]],
(*mask = 0xffffff00 | (s[3] ? 0xff : 0x00));
} }
#endif else if (s[1] == 0)
{
x = (stricmp_table[(int)s[0]] << 24);
*mask = 0xff000000;
}
else if (s[2] == 0)
{
x = (stricmp_table[(int)s[0]] << 24) | (stricmp_table[(int)s[1]] << 16);
*mask = 0xffff0000;
}
else
{
x = (stricmp_table[(int)s[0]] << 24) | (stricmp_table[(int)s[1]] << 16) | (stricmp_table[(int)s[2]] << 8) | stricmp_table[(int)s[3]];
*mask = 0xffffff00 | (s[3] ? 0xff : 0x00);
}
return x; return x;
} }
#endif #endif