Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-16 15:41:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

add langName and isoCode to dict struct

Browse source
This commit is contained in:
Eric House 2022-05-28 09:00:20 -07:00
parent 8c335aace3
commit 0e665a990e
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
xwords4/common/dictnry.c
View file

@ -282,13 +282,10 @@ parseCommon( DictionaryCtxt* dctx, XWEnv xwe, const XP_U8** ptrp, const XP_U8* e
if ( ptr == headerEnd ) { if ( ptr == headerEnd ) {
goto done; goto done;
} }
XP_UCHAR* langName = NULL; if ( getNullTermParam( dctx, &dctx->isoCode, &ptr, headerEnd )
XP_UCHAR* langCode = NULL; && getNullTermParam( dctx, &dctx->langName, &ptr, headerEnd ) ) {
if ( getNullTermParam( dctx, &langName, &ptr, headerEnd ) XP_LOGFF( "got langName: %s; isoCode: %s", dctx->langName,
&& getNullTermParam( dctx, &langCode, &ptr, headerEnd ) ) { dctx->isoCode );
XP_LOGFF( "got langName: %s; langCode: %s", langName, langCode );
XP_FREEP( dctx->mpool, &langName );
XP_FREEP( dctx->mpool, &langCode );
} else { } else {
goto done; goto done;
} }
@ -362,6 +359,12 @@ parseCommon( DictionaryCtxt* dctx, XWEnv xwe, const XP_U8** ptrp, const XP_U8* e
} }
dctx->langCode = xloc & 0x7F; dctx->langCode = xloc & 0x7F;
if ( NULL == dctx->isoCode ) {
const XP_UCHAR* isoCode = lcToLocale( dctx->langCode );
XP_ASSERT( !!isoCode );
dctx->isoCode = copyString( dctx->mpool, isoCode );
XP_LOGFF( "looked up isoCode %s for langCode %d", isoCode, dctx->langCode );
}
} }
if ( formatOk ) { if ( formatOk ) {
@ -1062,6 +1065,7 @@ destroy_stubbed_dict( DictionaryCtxt* dict )
XP_FREE( dict->mpool, dict->chars ); XP_FREE( dict->mpool, dict->chars );
XP_FREE( dict->mpool, dict->name ); XP_FREE( dict->mpool, dict->name );
XP_FREE( dict->mpool, dict->langName ); XP_FREE( dict->mpool, dict->langName );
XP_FREE( dict->mpool, dict->isoCode );
XP_FREE( dict->mpool, dict->bitmaps ); XP_FREE( dict->mpool, dict->bitmaps );
XP_FREE( dict->mpool, dict ); XP_FREE( dict->mpool, dict );
} /* destroy_stubbed_dict */ } /* destroy_stubbed_dict */
@ -1217,6 +1221,8 @@ dict_super_destroy( DictionaryCtxt* dict )
XP_FREEP( dict->mpool, &dict->faces ); XP_FREEP( dict->mpool, &dict->faces );
XP_FREEP( dict->mpool, &dict->facePtrs ); XP_FREEP( dict->mpool, &dict->facePtrs );
XP_FREEP( dict->mpool, &dict->name ); XP_FREEP( dict->mpool, &dict->name );
XP_FREEP( dict->mpool, &dict->isoCode );
XP_FREEP( dict->mpool, &dict->langName );
} }
const XP_UCHAR* const XP_UCHAR*

1
xwords4/common/dictnry.h
View file

@ -81,6 +81,7 @@ struct DictionaryCtxt {
necessarily the entry point for search!! */ necessarily the entry point for search!! */
XP_UCHAR* name; XP_UCHAR* name;
XP_UCHAR* langName; XP_UCHAR* langName;
XP_UCHAR* isoCode;
XP_UCHAR* faces; /* storage for faces */ XP_UCHAR* faces; /* storage for faces */
XP_UCHAR* facesEnd; XP_UCHAR* facesEnd;
XP_UCHAR* desc; XP_UCHAR* desc;