Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-07 05:24:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

factor out common code

Browse source
This commit is contained in:
Eric House 2012-09-08 07:45:18 -07:00
parent 8e58d8c1c0
commit 14a77ff7f1
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
xwords4/linux/linuxdict.c
View file

@ -83,6 +83,20 @@ linux_dictionary_make( MPFORMAL const char* dictFileName, XP_Bool useMMap )
return (DictionaryCtxt*)result; return (DictionaryCtxt*)result;
} /* gtk_dictionary_make */ } /* gtk_dictionary_make */
static XP_UCHAR*
getNullTermParam( LinuxDictionaryCtxt* dctx, const XP_U8** ptr,
XP_U16* headerLen )
{
XP_U16 len = 1 + XP_STRLEN( (XP_UCHAR*)*ptr );
XP_UCHAR* result = XP_MALLOC( dctx->super.mpool, len );
XP_MEMCPY( result, *ptr, len );
XP_LOGF( "%s: got param of len %d: \"%s\"", __func__,
len, result );
*ptr += len;
*headerLen -= len;
return result;
}
static XP_U16 static XP_U16
countSpecials( LinuxDictionaryCtxt* ctxt ) countSpecials( LinuxDictionaryCtxt* ctxt )
{ {
@ -298,24 +312,12 @@ initFromDictFile( LinuxDictionaryCtxt* dctx, const char* fileName )
XP_DEBUGF( "dict contains %ld words", dctx->super.nWords ); XP_DEBUGF( "dict contains %ld words", dctx->super.nWords );
if ( 0 < headerLen ) { if ( 0 < headerLen ) {
XP_U16 len = 1 + XP_STRLEN( (XP_UCHAR*)ptr ); dctx->super.desc = getNullTermParam( dctx, &ptr, &headerLen );
dctx->super.desc = XP_MALLOC( dctx->super.mpool, len );
XP_MEMCPY( dctx->super.desc, ptr, len );
XP_LOGF( "%s: got note of len %d: \"%s\"", __func__,
headerLen-1, dctx->super.desc );
ptr += len;
headerLen -= len;
} else { } else {
XP_LOGF( "%s: no note", __func__ ); XP_LOGF( "%s: no note", __func__ );
} }
if ( 0 < headerLen ) { if ( 0 < headerLen ) {
XP_U16 len = 1 + XP_STRLEN( (XP_UCHAR*)ptr ); dctx->super.md5Sum = getNullTermParam( dctx, &ptr, &headerLen );
dctx->super.md5Sum = XP_MALLOC( dctx->super.mpool, len );
XP_MEMCPY( dctx->super.md5Sum, ptr, len );
XP_LOGF( "%s: got md5Sum of len %d: \"%s\"", __func__,
headerLen-1, dctx->super.md5Sum );
ptr += len;
headerLen -= len;
} else { } else {
XP_LOGF( "%s: no md5Sum", __func__ ); XP_LOGF( "%s: no md5Sum", __func__ );
} }