Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-27 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

accept ISO-8859-2; remove unused param; add assert that EOF/EOL aren't

Browse source 
part of a multibyte char
This commit is contained in:
ehouse 2009-03-14 19:22:15 +00:00
parent b8a0da5366
commit 121b8253cf
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dawg/dict2dawg.cpp
View file

@ -114,7 +114,7 @@ static char* parseARGV( int argc, char** argv, const char** inFileName );
static void usage( const char* name );
static void error_exit( int line, const char* fmt, ... );
static void makeTableHash( void );
static WordList* parseAndSort( FILE* file );
static WordList* parseAndSort( void );
static void printWords( WordList* strings );
static bool firstBeforeSecond( const Letter* lhs, const Letter* rhs );
static char* tileToAscii( char* out, int outSize, const Letter* in );
@ -427,7 +427,7 @@ readFromSortedArray( void )
static WordList* sInputStrings = NULL; // we'll just let this leak
if ( sInputStrings == NULL ) {
sInputStrings = parseAndSort( gInFile );
sInputStrings = parseAndSort();
gNextWordIndex = 0;
#ifdef DEBUG
@ -513,6 +513,7 @@ getWideChar( FILE* file )
size_t siz;
if ( byt == EOF || byt == gTermChar ) {
assert( 0 == ii );
dest = byt;
break;
}
@ -717,7 +718,7 @@ tileToAscii( char* out, int outSize, const Letter* in )
}
static WordList*
parseAndSort( FILE* infile )
parseAndSort( void )
{
WordList* wordlist = new WordList;
@ -1251,6 +1252,8 @@ parseARGV( int argc, char** argv, const char** inFileName )
gIsMultibyte = false;
} else if ( !strcasecmp( enc, "iso-latin-1" ) ) {
gIsMultibyte = false;
} else if ( !strcasecmp( enc, "ISO-8859-2" ) ) {
gIsMultibyte = false;
} else {
ERROR_EXIT( "%s: unknown encoding %s", __func__, enc );
}