Silenced a ton of warnings, and disabled several unreferenced functions (dead code) - hopefully, compilation hasn't been broken...

svn-id: r38243
This commit is contained in:
Filippos Karapetis 2009-02-15 14:26:33 +00:00
parent c3cd2b7f06
commit 24dc986944
24 changed files with 86 additions and 28 deletions

View file

@ -104,6 +104,9 @@ _vfree(parse_rule_t *rule)
rule = NULL; rule = NULL;
} }
#if 0
// Unreferenced - removed
static parse_rule_t * static parse_rule_t *
_vbuild(int id, int argc, ...) _vbuild(int id, int argc, ...)
{ {
@ -132,7 +135,10 @@ _vbuild(int id, int argc, ...)
va_end(args); va_end(args);
return rule; return rule;
} }
#endif
#if 0
// Unreferenced - removed
static parse_rule_t * static parse_rule_t *
_vcat(int id, parse_rule_t *a, parse_rule_t *b) _vcat(int id, parse_rule_t *a, parse_rule_t *b)
{ {
@ -149,6 +155,7 @@ _vcat(int id, parse_rule_t *a, parse_rule_t *b)
return rule; return rule;
} }
#endif
static parse_rule_t * static parse_rule_t *
_vdup(parse_rule_t *a) _vdup(parse_rule_t *a)
@ -197,7 +204,8 @@ _vinsert(parse_rule_t *turkey, parse_rule_t *stuffing)
return rule; return rule;
} }
#if 0
// Unreferenced - removed
static int static int
_greibach_rule_p(parse_rule_t *rule) _greibach_rule_p(parse_rule_t *rule)
{ {
@ -212,6 +220,7 @@ _greibach_rule_p(parse_rule_t *rule)
return (rule->data[pos] & TOKEN_TERMINAL); return (rule->data[pos] & TOKEN_TERMINAL);
} }
#endif
static parse_rule_t * static parse_rule_t *
_vbuild_rule(parse_tree_branch_t *branch) _vbuild_rule(parse_tree_branch_t *branch)

View file

@ -321,7 +321,7 @@ kMenuSelect(state_t *s, int funct_nr, int argc, reg_t *argv)
int type = GET_SEL32V(event, type); int type = GET_SEL32V(event, type);
int message = GET_SEL32V(event, message); int message = GET_SEL32V(event, message);
int modifiers = GET_SEL32V(event, modifiers); int modifiers = GET_SEL32V(event, modifiers);
int menu_nr = -1, item_nr; int menu_nr = -1, item_nr = 0;
menu_item_t *item; menu_item_t *item;
int menu_mode = 0; /* Menu is active */ int menu_mode = 0; /* Menu is active */
int mouse_down = 0; int mouse_down = 0;

View file

@ -1091,9 +1091,9 @@ nearest_intersection(pf_state_t *s, point_t p, point_t q, point_t *ret)
** (point_t) *ret: On success, the closest intersection point ** (point_t) *ret: On success, the closest intersection point
*/ */
{ {
polygon_t *polygon; polygon_t *polygon = 0;
pointf_t isec; pointf_t isec;
polygon_t *ipolygon; polygon_t *ipolygon = 0;
float dist = HUGE_DISTANCE; float dist = HUGE_DISTANCE;
LIST_FOREACH(polygon, &s->polygons, entries) { LIST_FOREACH(polygon, &s->polygons, entries) {

View file

@ -532,7 +532,7 @@ kDoSound_SCI01(state_t *s, int funct_nr, int argc, reg_t *argv)
int sec = 0; int sec = 0;
int frame = 0; int frame = 0;
int result = SI_LOOP; /* small hack */ int result = SI_LOOP; /* small hack */
int cue; int cue = 0;
while (result == SI_LOOP) while (result == SI_LOOP)
result = sfx_poll_specific(&s->sound, handle, &cue); result = sfx_poll_specific(&s->sound, handle, &cue);

View file

@ -203,7 +203,7 @@ kSetSynonyms(state_t *s, int funct_nr, int argc, reg_t *argv)
while (node) { while (node) {
reg_t objpos = node->value; reg_t objpos = node->value;
int seg; int seg;
int synonyms_nr; int synonyms_nr = 0;
script = GET_SEL32V(objpos, number); script = GET_SEL32V(objpos, number);
seg = sm_seg_get(&(s->seg_manager), script); seg = sm_seg_get(&(s->seg_manager), script);

View file

@ -27,14 +27,19 @@
#include "sci/engine/message.h" #include "sci/engine/message.h"
#if 0
// Unreferenced - removed
static static
int get_talker_trivial(index_record_cursor_t *cursor) int get_talker_trivial(index_record_cursor_t *cursor)
{ {
return -1; return -1;
} }
#endif
/* Version 2.101 and later code ahead */ /* Version 2.101 and later code ahead */
#if 0
// Unreferenced - removed
static static
void index_record_parse_2101(index_record_cursor_t *cursor, message_tuple_t *t) void index_record_parse_2101(index_record_cursor_t *cursor, message_tuple_t *t)
{ {
@ -45,7 +50,10 @@ void index_record_parse_2101(index_record_cursor_t *cursor, message_tuple_t *t)
t->verb = verb; t->verb = verb;
t->cond = t->seq = 0; t->cond = t->seq = 0;
} }
#endif
#if 0
// Unreferenced - removed
static static
void index_record_get_text_2101(index_record_cursor_t *cursor, char *buffer, int buffer_size) void index_record_get_text_2101(index_record_cursor_t *cursor, char *buffer, int buffer_size)
{ {
@ -54,12 +62,16 @@ void index_record_get_text_2101(index_record_cursor_t *cursor, char *buffer, int
strncpy(buffer, stringptr, buffer_size); strncpy(buffer, stringptr, buffer_size);
} }
#endif
#if 0
// Unreferenced - removed
static static
int header_get_index_record_count_2101(byte *header) int header_get_index_record_count_2101(byte *header)
{ {
return getUInt16(header + 4); return getUInt16(header + 4);
} }
#endif
/* Version 3.411 and later code ahead */ /* Version 3.411 and later code ahead */
@ -211,7 +223,7 @@ static message_handler_t fixed_handler = {3411,
void message_state_initialize(resource_mgr_t *resmgr, message_state_t *state) void message_state_initialize(resource_mgr_t *resmgr, message_state_t *state)
{ {
resource_t *tester = scir_find_resource(resmgr, sci_message, 0, 0); resource_t *tester = scir_find_resource(resmgr, sci_message, 0, 0);
int version; //int version;
// if (tester == NULL) return; // if (tester == NULL) return;

View file

@ -1083,7 +1083,7 @@ c_man (state_t * s)
unsigned int i; unsigned int i;
char *name = cmd_params[0].str; char *name = cmd_params[0].str;
char *c = strchr(name, '.'); char *c = strchr(name, '.');
cmd_mm_entry_t *entry; cmd_mm_entry_t *entry = 0;
if (c) { if (c) {
*c = 0; *c = 0;

View file

@ -1977,7 +1977,7 @@ c_visible_map(state_t *s)
sciprintf("Not in debug state\n"); sciprintf("Not in debug state\n");
return 1; return 1;
} }
WARNING(fixme!) //WARNING(fixme!)
#if 0 #if 0
if (s->onscreen_console) if (s->onscreen_console)
con_restore_screen(s, s->osc_backup); con_restore_screen(s, s->osc_backup);
@ -2296,6 +2296,8 @@ rr = GET_SELECTOR(pos, rr); \
tt = GET_SELECTOR(pos, tt); \ tt = GET_SELECTOR(pos, tt); \
bb = GET_SELECTOR(pos, bb); bb = GET_SELECTOR(pos, bb);
#if 0
// Unreferenced - removed
static int static int
c_gfx_draw_viewobj(state_t *s) c_gfx_draw_viewobj(state_t *s)
{ {
@ -2379,7 +2381,7 @@ c_gfx_draw_viewobj(state_t *s)
return 0; return 0;
#endif #endif
} }
#endif
static int static int
c_gfx_flush_resources(state_t *s) c_gfx_flush_resources(state_t *s)

View file

@ -476,6 +476,8 @@ sm_free_script ( mem_obj_t* mem )
} }
/* memory operations */ /* memory operations */
#if 0
// Unreferenced - removed
static void static void
sm_mset (seg_manager_t* self, int offset, int c, size_t n, int id, int flag) { sm_mset (seg_manager_t* self, int offset, int c, size_t n, int id, int flag) {
mem_obj_t* mem_obj; mem_obj_t* mem_obj;
@ -495,7 +497,10 @@ sm_mset (seg_manager_t* self, int offset, int c, size_t n, int id, int flag) {
break; break;
} }
} }
#endif
#if 0
// Unreferenced - removed
static void static void
sm_mcpy_in_in (seg_manager_t* self, int dst, const int src, size_t n, int id, int flag) { sm_mcpy_in_in (seg_manager_t* self, int dst, const int src, size_t n, int id, int flag) {
mem_obj_t* mem_obj; mem_obj_t* mem_obj;
@ -515,6 +520,7 @@ sm_mcpy_in_in (seg_manager_t* self, int dst, const int src, size_t n, int id, in
break; break;
} }
} }
#endif
void void
sm_mcpy_in_out (seg_manager_t* self, int dst, const void* src, size_t n, int id, int flag) { sm_mcpy_in_out (seg_manager_t* self, int dst, const void* src, size_t n, int id, int flag) {
@ -536,6 +542,8 @@ sm_mcpy_in_out (seg_manager_t* self, int dst, const void* src, size_t n, int id,
} }
} }
#if 0
// Unreferenced - removed
static void static void
sm_mcpy_out_in (seg_manager_t* self, void* dst, const int src, size_t n, int id, int flag) { sm_mcpy_out_in (seg_manager_t* self, void* dst, const int src, size_t n, int id, int flag) {
mem_obj_t* mem_obj; mem_obj_t* mem_obj;
@ -555,6 +563,7 @@ sm_mcpy_out_in (seg_manager_t* self, void* dst, const int src, size_t n, int id,
break; break;
} }
} }
#endif
gint16 gint16
sm_get_heap (seg_manager_t* self, reg_t reg) sm_get_heap (seg_manager_t* self, reg_t reg)
@ -701,6 +710,8 @@ sm_set_export_width(struct _seg_manager_t* self, int flag)
self->exports_wide = flag; self->exports_wide = flag;
} }
#if 0
// Unreferenced - removed
static guint16 * static guint16 *
sm_get_export_table_offset (struct _seg_manager_t* self, int id, int flag, int *max) sm_get_export_table_offset (struct _seg_manager_t* self, int id, int flag, int *max)
{ {
@ -709,6 +720,7 @@ sm_get_export_table_offset (struct _seg_manager_t* self, int id, int flag, int *
*max = self->heap[id]->data.script.exports_nr; *max = self->heap[id]->data.script.exports_nr;
return self->heap[id]->data.script.export_table; return self->heap[id]->data.script.export_table;
} }
#endif
void void
sm_set_synonyms_offset (struct _seg_manager_t* self, int offset, int id, id_flag flag) { sm_set_synonyms_offset (struct _seg_manager_t* self, int offset, int id, id_flag flag) {
@ -737,13 +749,18 @@ sm_get_synonyms_nr (struct _seg_manager_t* self, int id, id_flag flag)
return self->heap[id]->data.script.synonyms_nr; return self->heap[id]->data.script.synonyms_nr;
} }
#if 0
// Unreferenced - removed
static int static int
sm_get_heappos (struct _seg_manager_t* self, int id, int flag) sm_get_heappos (struct _seg_manager_t* self, int id, int flag)
{ {
GET_SEGID(); GET_SEGID();
return 0; return 0;
} }
#endif
#if 0
// Unreferenced - removed
static void static void
sm_set_variables (struct _seg_manager_t* self, reg_t reg, int obj_index, reg_t variable_reg, int variable_index ) { sm_set_variables (struct _seg_manager_t* self, reg_t reg, int obj_index, reg_t variable_reg, int variable_index ) {
script_t* script; script_t* script;
@ -760,7 +777,7 @@ sm_set_variables (struct _seg_manager_t* self, reg_t reg, int obj_index, reg_t v
script->objects[obj_index].variables[variable_index] = variable_reg; script->objects[obj_index].variables[variable_index] = variable_reg;
} }
#endif
static inline int static inline int
_relocate_block(seg_manager_t *self, reg_t *block, int block_location, int block_items, seg_id_t segment, int location) _relocate_block(seg_manager_t *self, reg_t *block, int block_location, int block_items, seg_id_t segment, int location)
@ -959,7 +976,7 @@ sm_script_obj_init0(seg_manager_t *self, state_t *s, reg_t obj_pos)
script_t *scr; script_t *scr;
object_t *obj; object_t *obj;
int id; int id;
int base = obj_pos.offset - SCRIPT_OBJECT_MAGIC_OFFSET; unsigned int base = obj_pos.offset - SCRIPT_OBJECT_MAGIC_OFFSET;
reg_t temp; reg_t temp;
VERIFY( !(obj_pos.segment >= self->heap_size || mobj->type != MEM_OBJ_SCRIPT), VERIFY( !(obj_pos.segment >= self->heap_size || mobj->type != MEM_OBJ_SCRIPT),
@ -1165,7 +1182,7 @@ void
sm_script_initialise_locals(seg_manager_t *self, reg_t location) sm_script_initialise_locals(seg_manager_t *self, reg_t location)
{ {
mem_obj_t *mobj = self->heap[location.segment]; mem_obj_t *mobj = self->heap[location.segment];
int count; unsigned int count;
script_t *scr; script_t *scr;
local_variables_t *locals; local_variables_t *locals;

View file

@ -683,7 +683,7 @@ run_vm(state_t *s, int restoring)
seg_id_t variables_seg[4]; /* Same as above, contains segment IDs */ seg_id_t variables_seg[4]; /* Same as above, contains segment IDs */
#ifndef DISABLE_VALIDATIONS #ifndef DISABLE_VALIDATIONS
int variables_max[4]; /* Max. values for all variables */ int variables_max[4]; /* Max. values for all variables */
int code_buf_size = 0 /* (Avoid spurious warning) */; unsigned int code_buf_size = 0 /* (Avoid spurious warning) */;
#endif #endif
int temp; int temp;
gint16 aux_acc; /* Auxiliary 16 bit accumulator */ gint16 aux_acc; /* Auxiliary 16 bit accumulator */

View file

@ -35,6 +35,8 @@
** BYTESPP: Bytes per pixel ** BYTESPP: Bytes per pixel
*/ */
#include "common/scummsys.h"
/* set optimisations for Win32: */ /* set optimisations for Win32: */
/* g on: enable global optimizations */ /* g on: enable global optimizations */
/* t on: use fast code */ /* t on: use fast code */

View file

@ -111,6 +111,8 @@ _gfxop_alloc_colors(gfx_state_t *state, gfx_pixmap_color_t *colors, int colors_n
gfx_alloc_color(state->driver->mode->palette, colors + i); gfx_alloc_color(state->driver->mode->palette, colors + i);
} }
#if 0
// Unreferenced - removed
static void static void
_gfxop_free_colors(gfx_state_t *state, gfx_pixmap_color_t *colors, int colors_nr) _gfxop_free_colors(gfx_state_t *state, gfx_pixmap_color_t *colors, int colors_nr)
{ {
@ -122,7 +124,7 @@ _gfxop_free_colors(gfx_state_t *state, gfx_pixmap_color_t *colors, int colors_nr
for (i = 0; i < colors_nr; i++) for (i = 0; i < colors_nr; i++)
gfx_free_color(state->driver->mode->palette, colors + i); gfx_free_color(state->driver->mode->palette, colors + i);
} }
#endif
int _gfxop_clip(rect_t *rect, rect_t clipzone) int _gfxop_clip(rect_t *rect, rect_t clipzone)
/* Returns 1 if nothing is left */ /* Returns 1 if nothing is left */

View file

@ -42,7 +42,7 @@ gfxr_read_pal11(int id, int *colors_nr, byte *resource, int size)
{ {
int start_color = resource[25]; int start_color = resource[25];
int format = resource[32]; int format = resource[32];
int entry_size; int entry_size = 0;
gfx_pixmap_color_t *retval; gfx_pixmap_color_t *retval;
byte *pal_data = resource + 37; byte *pal_data = resource + 37;
int _colors_nr = *colors_nr = getUInt16(resource + 29); int _colors_nr = *colors_nr = getUInt16(resource + 29);

View file

@ -368,7 +368,8 @@ _gfxr_auxbuf_tag_line(gfxr_pic_t *pic, int pos, int width)
pic->aux_map[i+pos] |= FRESH_PAINT; pic->aux_map[i+pos] |= FRESH_PAINT;
} }
#if 0
// Unreferenced - removed
static void static void
_gfxr_auxbuf_spread(gfxr_pic_t *pic, int *min_x, int *min_y, int *max_x, int *max_y) _gfxr_auxbuf_spread(gfxr_pic_t *pic, int *min_x, int *min_y, int *max_x, int *max_y)
{ {
@ -518,7 +519,7 @@ _gfxr_auxbuf_spread(gfxr_pic_t *pic, int *min_x, int *min_y, int *max_x, int *ma
(*max_y)++; (*max_y)++;
} }
#endif
/*** Regular drawing operations ***/ /*** Regular drawing operations ***/

View file

@ -18,6 +18,8 @@
***************************************************************************/ ***************************************************************************/
#include "sci/include/gfx_resource.h"
/* Generic pic filling code, to be included by sci_pic_0.c /* Generic pic filling code, to be included by sci_pic_0.c
* *
* *

View file

@ -191,6 +191,7 @@ sbtree_get(sbtree_t *tree, int key)
return NULL; return NULL;
} }
#if 0
static void static void
sbtree_print(sbtree_t *tree) sbtree_print(sbtree_t *tree)
{ {
@ -216,7 +217,7 @@ sbtree_print(sbtree_t *tree)
} }
fprintf(stderr,"\n"); fprintf(stderr,"\n");
} }
#endif
/***************************** TEST CODE ********************************/ /***************************** TEST CODE ********************************/

View file

@ -132,7 +132,7 @@ typedef struct { /* gfx_pixmap_color_t: Pixmap-specific color entries */
typedef struct { /* gfx_color_t: Full color */ typedef struct { /* gfx_color_t: Full color */
gfx_pixmap_color_t visual; gfx_pixmap_color_t visual;
guint8 alpha; /* transparency = (1-opacity) */ guint8 alpha; /* transparency = (1-opacity) */
byte priority, control; signed char priority, control;
byte mask; /* see mask values below */ byte mask; /* see mask values below */
} gfx_color_t; } gfx_color_t;

View file

@ -48,7 +48,7 @@ sciprintf (const char *fmt, ...)
{ {
va_list argp; va_list argp;
size_t bufsize = 256; size_t bufsize = 256;
int i; unsigned int i;
char *buf = (char *) sci_malloc (bufsize); char *buf = (char *) sci_malloc (bufsize);
if (NULL == fmt) { if (NULL == fmt) {

View file

@ -442,7 +442,7 @@ scir_add_appropriate_sources(resource_mgr_t *mgr,
char *dir) char *dir)
{ {
char *trailing_slash = ""; char *trailing_slash = "";
char path_separator; //char path_separator;
sci_dir_t dirent; sci_dir_t dirent;
char *name; char *name;
resource_source_t *map; resource_source_t *map;

View file

@ -363,7 +363,7 @@ script_dissect(resource_mgr_t *resmgr, int res_no, char **snames, int snames_nr)
while (_seeker < script->size) { while (_seeker < script->size) {
int objtype = getInt16(script->data + _seeker); int objtype = getInt16(script->data + _seeker);
int objsize; int objsize;
int seeker = _seeker + 4; unsigned int seeker = _seeker + 4;
if (!objtype) { if (!objtype) {
sciprintf("End of script object (#0) encountered.\n"); sciprintf("End of script object (#0) encountered.\n");

View file

@ -115,7 +115,7 @@ is_mac_exe(char *filename)
FILE *file; FILE *file;
byte buf[4]; byte buf[4];
guint32 val; guint32 val;
int i; unsigned int i;
/* Mac executables have no extension */ /* Mac executables have no extension */
if (strchr(filename, '.')) if (strchr(filename, '.'))

View file

@ -125,7 +125,8 @@ _freeze_time(sfx_state_t *self)
} }
} }
#if 0
// Unreferenced - removed
static void static void
_dump_playing_list(sfx_state_t *self, char *msg) _dump_playing_list(sfx_state_t *self, char *msg)
{ {
@ -148,6 +149,7 @@ _dump_playing_list(sfx_state_t *self, char *msg)
fprintf(stderr, "]\n"); fprintf(stderr, "]\n");
} }
#endif
static void static void
_dump_songs(sfx_state_t *self) _dump_songs(sfx_state_t *self)

View file

@ -799,7 +799,7 @@ _sci1_song_init(sci1_song_iterator_t *self)
{ {
sci1_sample_t *seeker; sci1_sample_t *seeker;
int last_time; int last_time;
int offset = 0; unsigned int offset = 0;
self->channels_nr = 0; self->channels_nr = 0;
self->next_sample = 0; self->next_sample = 0;
// self->device_id = 0x0c; // self->device_id = 0x0c;
@ -947,6 +947,8 @@ _sci1_no_delta_time(sci1_song_iterator_t *self)
return 1; return 1;
} }
#if 0
// Unreferenced - removed
static void static void
_sci1_dump_state(sci1_song_iterator_t *self) _sci1_dump_state(sci1_song_iterator_t *self)
{ {
@ -982,6 +984,7 @@ _sci1_dump_state(sci1_song_iterator_t *self)
} }
sciprintf("------------------------------------------\n"); sciprintf("------------------------------------------\n");
} }
#endif
#define COMMAND_INDEX_NONE -1 #define COMMAND_INDEX_NONE -1
#define COMMAND_INDEX_PCM -2 #define COMMAND_INDEX_PCM -2
@ -1537,7 +1540,7 @@ _tee_read_next_command(tee_song_iterator_t *it, unsigned char *buf,
if ((it->status & (TEE_LEFT_ACTIVE | TEE_RIGHT_ACTIVE)) if ((it->status & (TEE_LEFT_ACTIVE | TEE_RIGHT_ACTIVE))
!= (TEE_LEFT_ACTIVE | TEE_RIGHT_ACTIVE)) { != (TEE_LEFT_ACTIVE | TEE_RIGHT_ACTIVE)) {
/* Not all are is active? */ /* Not all are is active? */
int which; int which = 0;
#ifdef DEBUG_TEE_ITERATOR #ifdef DEBUG_TEE_ITERATOR
fprintf(stderr, "\tRequesting transformation...\n"); fprintf(stderr, "\tRequesting transformation...\n");
#endif #endif
@ -1742,6 +1745,8 @@ _tee_init(tee_song_iterator_t *it)
it->children[TEE_RIGHT].it->init(it->children[TEE_RIGHT].it); it->children[TEE_RIGHT].it->init(it->children[TEE_RIGHT].it);
} }
#if 0
// Unreferenced - removed
static void static void
_tee_free(tee_song_iterator_t *it) _tee_free(tee_song_iterator_t *it)
{ {
@ -1750,6 +1755,7 @@ _tee_free(tee_song_iterator_t *it)
if (it->children[i].it && it->may_destroy) if (it->children[i].it && it->may_destroy)
songit_free(it->children[i].it); songit_free(it->children[i].it);
} }
#endif
static void static void
songit_tee_death_notification(tee_song_iterator_t *self, songit_tee_death_notification(tee_song_iterator_t *self,

View file

@ -250,6 +250,8 @@ _mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed)
BREAKPOINT(); BREAKPOINT();
} }
#if 0
// Unreferenced - removed
static void static void
mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed) mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed)
{ {
@ -257,7 +259,7 @@ mix_unsubscribe(sfx_pcm_mixer_t *self, sfx_pcm_feed_t *feed)
_mix_unsubscribe(self, feed); _mix_unsubscribe(self, feed);
RELEASE_LOCK(); RELEASE_LOCK();
} }
#endif
static void static void
mix_exit(sfx_pcm_mixer_t *self) mix_exit(sfx_pcm_mixer_t *self)