LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

eliminated a whole bunch of gcc warnings

Browse Source
This commit is contained in:
Bill Meltsner
2010-02-09 13:21:25 -05:00
parent 3ebcee1e17
commit 73aba4bdd4
11 changed files with 242 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/StringMap.h
+33 -33
View File
@@ -1,21 +1,21 @@
/**
* Copyright (c) 2006-2010 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
/**
* Copyright (c) 2006-2010 LOVE Development Team
*
* This software is provided 'as-is', without any express or implied
* warranty. In no event will the authors be held liable for any damages
* arising from the use of this software.
*
* Permission is granted to anyone to use this software for any purpose,
* including commercial applications, and to alter it and redistribute it
* freely, subject to the following restrictions:
*
* 1. The origin of this software must not be misrepresented; you must not
* claim that you wrote the original software. If you use this software
* in a product, an acknowledgment in the product documentation would be
* appreciated but is not required.
* 2. Altered source versions must be plainly marked as such, and must not be
* misrepresented as being the original software.
* 3. This notice may not be removed or altered from any source distribution.
**/
#ifndef LOVE_STRING_MAP_H
@@ -65,8 +65,8 @@ namespace love
}
}
bool streq(const char * a, const char * b)
{
bool streq(const char * a, const char * b)
{
while(*a != 0 && *b != 0)
{
if(*a != *b)
@@ -75,16 +75,16 @@ namespace love
++b;
}
return (*a == 0 && *b == 0);
return (*a == 0 && *b == 0);
}
bool find(const char * key, T & t)
{
unsigned str_hash = djb2(key);
//unsigned str_hash = djb2(key);
for(unsigned i = 0; i < MAX; ++i)
{
unsigned str_i = (str_hash + i) % MAX;
//unsigned str_i = (str_hash + i) % MAX; //this isn't used, is this intentional?
if(records[i].set && streq(records[i].key, key))
{
@@ -145,16 +145,16 @@ namespace love
return inserted;
}
unsigned djb2(const char * key)
{
unsigned hash = 5381;
int c;
while (c = *key++)
hash = ((hash << 5) + hash) + c;
return hash;
unsigned djb2(const char * key)
{
unsigned hash = 5381;
int c;
while ((c = *key++))
hash = ((hash << 5) + hash) + c;
return hash;
}
}; // StringMap