emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #637 from jokester/remove-direct-strdup-free

Browse source 
use default allocator in place of strdup/free
This commit is contained in:
Geoff McLane 2017-10-29 18:30:52 +01:00 committed by GitHub
parent b243e0f30a ff68144724
commit 319cded6ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/language.c
View file

@ -299,6 +299,7 @@ ctmbstr TY_(tidyLocalizedString)( uint messageType )
** Determines the current locale without affecting the C locale. ** Determines the current locale without affecting the C locale.
** Tidy has always used the default C locale, and at this point ** Tidy has always used the default C locale, and at this point
** in its development we're not going to tamper with that. ** in its development we're not going to tamper with that.
** @note this routine uses default allocator, see tidySetMallocCall.
** @param result The buffer to use to return the string. ** @param result The buffer to use to return the string.
** Returns NULL on failure. ** Returns NULL on failure.
** @return The same buffer for convenience. ** @return The same buffer for convenience.
@ -306,6 +307,7 @@ ctmbstr TY_(tidyLocalizedString)( uint messageType )
tmbstr TY_(tidySystemLocale)(tmbstr result) tmbstr TY_(tidySystemLocale)(tmbstr result)
{ {
ctmbstr temp; ctmbstr temp;
TidyAllocator* allocator = &TY_(g_default_allocator);
/* This should set the OS locale. */ /* This should set the OS locale. */
setlocale( LC_ALL, "" ); setlocale( LC_ALL, "" );
@ -315,7 +317,7 @@ tmbstr TY_(tidySystemLocale)(tmbstr result)
/* Make a new copy of the string, because temp /* Make a new copy of the string, because temp
always points to the current locale. */ always points to the current locale. */
if (( result = malloc( strlen( temp ) + 1 ) )) if (( result = TidyAlloc( allocator, strlen( temp ) + 1 ) ))
strcpy(result, temp); strcpy(result, temp);
/* This should restore the C locale. */ /* This should restore the C locale. */
@ -329,13 +331,16 @@ tmbstr TY_(tidySystemLocale)(tmbstr result)
* Retrieves the POSIX name for a string. Result is a static char so please * Retrieves the POSIX name for a string. Result is a static char so please
* don't try to free it. If the name looks like a cc_ll identifier, we will * don't try to free it. If the name looks like a cc_ll identifier, we will
* return it if there's no other match. * return it if there's no other match.
* @note this routine uses default allocator, see tidySetMallocCall.
*/ */
tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale ) tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
{ {
uint i; uint i;
uint len; uint len;
static char result[6] = "xx_yy"; static char result[6] = "xx_yy";
tmbstr search = strdup(locale); TidyAllocator * allocator = &TY_(g_default_allocator);
tmbstr search = TY_(tmbstrdup)( allocator, locale );
search = TY_(tmbstrtolower)(search); search = TY_(tmbstrtolower)(search);
/* See if our string matches a Windows name. */ /* See if our string matches a Windows name. */
@ -343,8 +348,8 @@ tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
{ {
if ( strcmp( localeMappings[i].winName, search ) == 0 ) if ( strcmp( localeMappings[i].winName, search ) == 0 )
{ {
free(search); TidyFree( allocator, search );
search = strdup(localeMappings[i].POSIXName); search = TY_(tmbstrdup)( allocator, localeMappings[i].POSIXName );
break; break;
} }
} }
@ -376,7 +381,7 @@ tmbstr TY_(tidyNormalizedLocaleName)( ctmbstr locale )
} }
} }
free( search ); TidyFree( allocator, search );
return result; return result;
} }

2
src/tmbstr.c
View file

@ -102,7 +102,7 @@ uint TY_(tmbstrlen)( ctmbstr str )
} }
/* /*
MS C 4.2 doesn't include strcasecmp. MS C 4.2 (and ANSI C) doesn't include strcasecmp.
Note that tolower and toupper won't Note that tolower and toupper won't
work on chars > 127. work on chars > 127.