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

add some consts and better test for null index data

Browse source
This commit is contained in:
Andy2 2011-11-01 18:18:06 -07:00 committed by Andy2
parent fc4a5c31f4
commit eb2b139e48
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xwords4/common/dictiter.c
View file

@ -231,7 +231,7 @@ dict_countWords( const DictionaryCtxt* dict )
static DictPosition
placeWordClose( const DictionaryCtxt* dict, DictPosition position,
XP_U16 depth, IndexData* data, EdgeArray* result )
XP_U16 depth, const IndexData* data, EdgeArray* result )
{
XP_S16 low = 0;
XP_S16 high = data->count - 1;
@ -446,7 +446,7 @@ dict_getPrevWord( const DictionaryCtxt* dict, DictWord* word )
at the closer end. Then move as many steps as necessary to reach it. */
XP_Bool
dict_getNthWord( const DictionaryCtxt* dict, DictWord* word,
DictPosition position, XP_U16 depth, IndexData* data )
DictPosition position, XP_U16 depth, const IndexData* data )
{
XP_U32 wordCount;
XP_Bool validWord = 0 < word->nTiles;
@ -474,7 +474,7 @@ dict_getNthWord( const DictionaryCtxt* dict, DictWord* word,
if ( !success ) {
EdgeArray edges;
XP_U32 wordIndex;
if ( !!data ) {
if ( !!data && !!data->prefixes && !!data->indices ) {
wordIndex = placeWordClose( dict, position, depth, data, &edges );
if ( !validWord ) {
initWord( dict, word );

2
xwords4/common/dictiter.h
View file

@ -58,7 +58,7 @@ XP_Bool dict_getNextWord( const DictionaryCtxt* dict, DictWord* word );
XP_Bool dict_getPrevWord( const DictionaryCtxt* dict, DictWord* word );
XP_Bool dict_getNthWord( const DictionaryCtxt* dict, DictWord* word,
DictPosition position, XP_U16 depth,
IndexData* data );
const IndexData* data );
void dict_wordToString( const DictionaryCtxt* dict, const DictWord* word,
XP_UCHAR* buf, XP_U16 buflen );
DictPosition dict_getStartsWith( const DictionaryCtxt* dict,