Skip to content

Commit

Permalink
Cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
bkaradzic committed Nov 14, 2017
1 parent fe9136c commit 40902a6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions 3rdparty/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ root = true
[ini/*]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
12 changes: 6 additions & 6 deletions 3rdparty/ini/ini.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ to substitute them for your own. Here's an example:
#define INI_IMPLEMENTATION
#define INI_MEMCPY( dst, src, cnt ) ( my_memcpy_func( dst, src, cnt ) )
#define INI_STRLEN( s ) ( my_strlen_func( s ) )
#define INI_STRICMP( s1, s2 ) ( my_stricmp_func( s1, s2 ) )
#define INI_STRNICMP( s1, s2, cnt ) ( my_strnicmp_func( s1, s2, cnt ) )
#include "ini.h"
If no custom function is defined, ini.h will default to the C runtime library equivalent.
Expand Down Expand Up @@ -414,13 +414,13 @@ the length is determined automatically, but in this case `value` has to be zero-
#define INI_STRLEN( s ) ( strlen( s ) )
#endif

#ifndef INI_STRICMP
#ifndef INI_STRNICMP
#ifdef _WIN32
#include <string.h>
#define INI_STRICMP( s1, s2 ) ( stricmp( s1, s2 ) )
#define INI_STRNICMP( s1, s2, cnt ) ( strnicmp( s1, s2, cnt ) )
#else
#include <string.h>
#define INI_STRICMP( s1, s2 ) ( strcasecmp( s1, s2 ) )
#define INI_STRNICMP( s1, s2, cnt ) ( strncasecmp( s1, s2, cnt ) )
#endif
#endif

Expand Down Expand Up @@ -738,7 +738,7 @@ int ini_find_section( ini_t const* ini, char const* name, int name_length )
{
char const* const other =
ini->sections[ i ].name_large ? ini->sections[ i ].name_large : ini->sections[ i ].name;
if( (int) INI_STRLEN( other ) == name_length && INI_STRICMP( name, other, name_length) == 0 )
if( (int) INI_STRLEN( other ) == name_length && INI_STRNICMP( name, other, name_length ) == 0 )
return i;
}
}
Expand All @@ -762,7 +762,7 @@ int ini_find_property( ini_t const* ini, int section, char const* name, int name
{
char const* const other =
ini->properties[ i ].name_large ? ini->properties[ i ].name_large : ini->properties[ i ].name;
if( (int) INI_STRLEN( other ) == name_length && INI_STRICMP( name, other, name_length) == 0 )
if( (int) INI_STRLEN( other ) == name_length && INI_STRNICMP( name, other, name_length ) == 0 )
return c;
++c;
}
Expand Down

0 comments on commit 40902a6

Please sign in to comment.