cleanup; remove dead code

This commit is contained in:
Eric House 2021-03-07 16:10:48 -08:00
parent 17311dc757
commit 52b1300d90
5 changed files with 6 additions and 8 deletions

View file

@ -123,7 +123,6 @@ model_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
{
ModelCtxt* model;
XP_U16 nCols;
XP_U16 ii;
XP_U16 nPlayers;
XP_U16 version = stream_getVersion( stream );
@ -152,7 +151,7 @@ model_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
model->vol.bonuses =
XP_MALLOC( model->vol.mpool,
model->vol.nBonuses * sizeof( model->vol.bonuses[0] ) );
for ( ii = 0; ii < model->vol.nBonuses; ++ii ) {
for ( int ii = 0; ii < model->vol.nBonuses; ++ii ) {
model->vol.bonuses[ii] = stream_getBits( stream, 4 );
}
}
@ -174,7 +173,7 @@ model_makeFromStream( MPFORMAL XWEnv xwe, XWStreamCtxt* stream,
(XWStreamCtxt*)NULL, (WordNotifierInfo*)NULL,
pre, post, closure );
for ( ii = 0; ii < model->nPlayers; ++ii ) {
for ( int ii = 0; ii < model->nPlayers; ++ii ) {
loadPlayerCtxt( model, stream, version, &model->players[ii] );
setPendingCounts( model, ii );
invalidateScore( model, ii );

View file

@ -38,7 +38,7 @@ static const XP_UCHAR* linux_dutil_getUserQuantityString( XW_DUtilCtxt* duc, XWE
XP_U16 quantity );
static void linux_dutil_storePtr( XW_DUtilCtxt* duc, XWEnv xwe, const XP_UCHAR* keys[],
void* data, XP_U32 len );
const void* data, XP_U32 len );
static void linux_dutil_loadPtr( XW_DUtilCtxt* duc, XWEnv xwe, const XP_UCHAR* keys[],
void* data, XP_U32* lenp );
static void linux_dutil_forEach( XW_DUtilCtxt* duc, XWEnv xwe,
@ -298,7 +298,7 @@ linux_dutil_getUserQuantityString( XW_DUtilCtxt* duc, XWEnv xwe, XP_U16 code,
static void
linux_dutil_storePtr( XW_DUtilCtxt* duc, XWEnv XP_UNUSED(xwe),
const XP_UCHAR* keys[],
void* data, const XP_U32 len )
const void* data, const XP_U32 len )
{
XP_ASSERT( keys[1] == NULL );
LaunchParams* params = (LaunchParams*)duc->closure;

View file

@ -45,6 +45,7 @@ DEFINES += -DXWFEATURE_CROSSHAIRS
DEFINES += -DXWFEATURE_STREAMREF
DEFINES += -DXWFEATURE_TURNCHANGENOTIFY
DEFINES += -DXWFEATURE_BOARDWORDS
DEFINES += -DXWFEATURE_DEVICE
DEFINES += -DNATIVE_NLI
DEFINES += -DDEBUG_REF
DEFINES += -Wno-switch

View file

@ -46,7 +46,6 @@
#include "wasmutil.h"
#include "wasmdutil.h"
#include "wasmdict.h"
#include "wasmasm.h"
#ifdef __EMSCRIPTEN__
#include <emscripten.h>

View file

@ -33,7 +33,6 @@
#include "main.h"
#include "dbgutil.h"
#include "LocalizedStrIncludes.h"
#include "wasmasm.h"
#include "wasmdict.h"
typedef struct _WasmDUtilCtxt {
@ -252,7 +251,7 @@ wasm_dutil_loadStream( XW_DUtilCtxt* duc, XWEnv xwe, const char* keys[],
static void
wasm_dutil_storePtr( XW_DUtilCtxt* duc, XWEnv xwe,
const char* keys[],
void* data, XP_U32 len )
const void* data, XP_U32 len )
{
char path[128];
ensurePath(keys, path, true);