summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-03-31 10:06:05 +0000
committer Miodrag Milanovic <mmicko@gmail.com>2014-03-31 10:06:05 +0000
commit2cc9ca4c5e2c5c65764ff43beb1f21f93ca3aac8 (patch)
tree2d13f899e1da5fb939bbeccff1d411abccaa689c /src
parentc8b93e57d2392b50eafdf120198997b870e0deb4 (diff)
VS2013 x64 is little bit more anal about signed/unsigned comparison (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/cpu/i860/i860dis.c2
-rw-r--r--src/emu/debug/debugcmd.c16
-rw-r--r--src/emu/debug/debughlp.c5
-rw-r--r--src/emu/debugint/debugint.c2
-rw-r--r--src/emu/distate.c2
-rw-r--r--src/emu/machine/microtch.c2
-rw-r--r--src/emu/machine/nvram.c2
-rw-r--r--src/emu/machine/pckeybrd.c2
-rw-r--r--src/emu/netlist/pstring.c2
-rw-r--r--src/emu/uiinput.c2
-rw-r--r--src/emu/video/pc_vga.c15
-rw-r--r--src/emu/video/vic4567.c2
-rw-r--r--src/lib/formats/ap_dsk35.c3
-rw-r--r--src/lib/formats/cassimg.c4
-rw-r--r--src/lib/formats/flopimg.c2
-rw-r--r--src/lib/formats/thom_cas.c4
-rw-r--r--src/lib/formats/thom_dsk.c4
-rw-r--r--src/lib/formats/ti99_dsk.c5
-rw-r--r--src/lib/util/chdcd.c2
-rw-r--r--src/lib/util/opresolv.c6
-rw-r--r--src/lib/util/un7z.c2
-rw-r--r--src/lib/util/unicode.c2
-rw-r--r--src/lib/util/zippath.c2
-rw-r--r--src/mame/drivers/astrafr.c2
-rw-r--r--src/mame/drivers/blmbycar.c2
-rw-r--r--src/mame/drivers/coolridr.c2
-rw-r--r--src/mame/drivers/ddenlovr.c6
-rw-r--r--src/mame/drivers/dynax.c4
-rw-r--r--src/mame/drivers/fantland.c2
-rw-r--r--src/mame/drivers/gaiden.c2
-rw-r--r--src/mame/drivers/hng64.c2
-rw-r--r--src/mame/drivers/igs009.c2
-rw-r--r--src/mame/drivers/itech32.c2
-rw-r--r--src/mame/drivers/jclub2.c2
-rw-r--r--src/mame/drivers/nmk16.c2
-rw-r--r--src/mame/drivers/pgm.c2
-rw-r--r--src/mame/drivers/pirates.c2
-rw-r--r--src/mame/drivers/puckpkmn.c2
-rw-r--r--src/mame/drivers/tecmosys.c2
-rw-r--r--src/mame/drivers/wecleman.c2
-rw-r--r--src/mame/machine/neocrypt.c2
-rw-r--r--src/mame/machine/scramble.c6
-rw-r--r--src/mame/video/dynax.c6
-rw-r--r--src/mess/drivers/a2600.c41
-rw-r--r--src/mess/drivers/pockstat.c4
-rw-r--r--src/mess/drivers/ssem.c7
-rw-r--r--src/mess/drivers/svmu.c2
-rw-r--r--src/mess/tools/imgtool/modules/bml3.c2
-rw-r--r--src/mess/tools/imgtool/modules/fat.c4
-rw-r--r--src/mess/tools/imgtool/modules/mac.c9
-rw-r--r--src/mess/tools/imgtool/modules/psion.c6
-rw-r--r--src/mess/tools/imgtool/modules/vzdos.c3
-rw-r--r--src/osd/windows/drawgdi.c2
-rw-r--r--src/osd/windows/winfile.c2
-rw-r--r--src/tools/src2html.c2
55 files changed, 124 insertions, 104 deletions
diff --git a/src/emu/cpu/i860/i860dis.c b/src/emu/cpu/i860/i860dis.c
index a8edca03df2..042e3072094 100644
--- a/src/emu/cpu/i860/i860dis.c
+++ b/src/emu/cpu/i860/i860dis.c
@@ -618,7 +618,7 @@ static const decode_tbl_t fp_decode_tbl[128] =
/* Replaces tabs with spaces. */
static void i860_dasm_tab_replacer(char* buf, int tab_size)
{
- int i = 0;
+ size_t i = 0;
int tab_count = 0;
char tab_buf[1024];
memset(tab_buf, 0, 1024);
diff --git a/src/emu/debug/debugcmd.c b/src/emu/debug/debugcmd.c
index c4a7b27c06d..b791df71ed5 100644
--- a/src/emu/debug/debugcmd.c
+++ b/src/emu/debug/debugcmd.c
@@ -2083,7 +2083,7 @@ static void execute_cheatinit(running_machine &machine, int ref, int params, con
static void execute_cheatnext(running_machine &machine, int ref, int params, const char *param[])
{
address_space *space;
- UINT64 cheatindex;
+ int cheatindex;
UINT32 active_cheat = 0;
UINT8 condition;
UINT64 comp_value = 0;
@@ -2149,7 +2149,7 @@ static void execute_cheatnext(running_machine &machine, int ref, int params, con
cheat.undo++;
/* execute the search */
- for (cheatindex = 0; cheatindex < (UINT64)cheat.cheatmap.count(); cheatindex += 1)
+ for (cheatindex = 0; cheatindex < cheat.cheatmap.count(); cheatindex += 1)
if (cheat.cheatmap[cheatindex].state == 1)
{
UINT64 cheat_value = cheat_read_extended(&cheat, *space, cheat.cheatmap[cheatindex].offset);
@@ -2263,7 +2263,7 @@ static void execute_cheatlist(running_machine &machine, int ref, int params, con
address_space *space;
device_t *cpu;
UINT32 active_cheat = 0;
- UINT64 cheatindex;
+ int cheatindex;
UINT64 sizemask;
FILE *f = NULL;
@@ -2294,7 +2294,7 @@ static void execute_cheatlist(running_machine &machine, int ref, int params, con
}
/* write the cheat list */
- for (cheatindex = 0; cheatindex < (UINT64)cheat.cheatmap.count(); cheatindex += 1)
+ for (cheatindex = 0; cheatindex < cheat.cheatmap.count(); cheatindex += 1)
{
if (cheat.cheatmap[cheatindex].state == 1)
{
@@ -2325,12 +2325,12 @@ static void execute_cheatlist(running_machine &machine, int ref, int params, con
static void execute_cheatundo(running_machine &machine, int ref, int params, const char *param[])
{
- UINT64 cheatindex;
+ int cheatindex;
UINT32 undo_count = 0;
if (cheat.undo > 0)
{
- for (cheatindex = 0; cheatindex < (UINT64)cheat.cheatmap.count(); cheatindex += 1)
+ for (cheatindex = 0; cheatindex < cheat.cheatmap.count(); cheatindex += 1)
{
if (cheat.cheatmap[cheatindex].undo == cheat.undo)
{
@@ -2359,9 +2359,9 @@ static void execute_find(running_machine &machine, int ref, int params, const ch
UINT64 data_to_find[256];
UINT8 data_size[256];
int cur_data_size;
- int data_count = 0;
+ size_t data_count = 0;
int found = 0;
- int j;
+ size_t j;
/* validate parameters */
if (!debug_command_parameter_number(machine, param[0], &offset))
diff --git a/src/emu/debug/debughlp.c b/src/emu/debug/debughlp.c
index 1a06b2cc30a..5ed786437b7 100644
--- a/src/emu/debug/debughlp.c
+++ b/src/emu/debug/debughlp.c
@@ -1472,8 +1472,9 @@ const char *debug_get_help(const char *tag)
{
static char ambig_message[1024];
const help_item *found = NULL;
- int i, msglen, foundcount = 0;
- int taglen = (int)strlen(tag);
+ size_t i;
+ int msglen, foundcount = 0;
+ size_t taglen = strlen(tag);
char tagcopy[256];
/* make a lowercase copy of the tag */
diff --git a/src/emu/debugint/debugint.c b/src/emu/debugint/debugint.c
index 42c000e3e6a..ad6507f2f6f 100644
--- a/src/emu/debugint/debugint.c
+++ b/src/emu/debugint/debugint.c
@@ -445,7 +445,7 @@ static void dview_set_title(DView *dv, astring title)
static void dview_draw_title(DView *dv)
{
- int i;
+ size_t i;
rgb_t col = rgb_t(0xff,0x00,0x00,0xff);
rectangle r;
diff --git a/src/emu/distate.c b/src/emu/distate.c
index 15f834b0ecb..c78a7f06f8f 100644
--- a/src/emu/distate.c
+++ b/src/emu/distate.c
@@ -324,7 +324,7 @@ astring &device_state_entry::format(astring &dest, const char *string, bool maxo
const_cast<device_state_entry *>(this)->m_flags |= DSF_CUSTOM_STRING;
return dest;
}
- if (strlen(string) <= width)
+ if (strlen(string) <= (size_t)width)
{
dest.cat(string);
width -= strlen(string);
diff --git a/src/emu/machine/microtch.c b/src/emu/machine/microtch.c
index 4f7db4c38b5..76d98ab1610 100644
--- a/src/emu/machine/microtch.c
+++ b/src/emu/machine/microtch.c
@@ -35,7 +35,7 @@ microtouch_device::microtouch_device(const machine_config &mconfig, const char *
int microtouch_device::check_command( const char* commandtocheck, int command_len, UINT8* command_data )
{
- if ( (command_len == (strlen(commandtocheck) + 2)) &&
+ if ( ((size_t)command_len == (strlen(commandtocheck) + 2)) &&
(command_data[0] == 0x01) &&
(strncmp(commandtocheck, (const char*)command_data + 1, strlen(commandtocheck)) == 0) &&
(command_data[command_len-1] == 0x0d) )
diff --git a/src/emu/machine/nvram.c b/src/emu/machine/nvram.c
index c4dd6c1388a..09224847a03 100644
--- a/src/emu/machine/nvram.c
+++ b/src/emu/machine/nvram.c
@@ -105,7 +105,7 @@ void nvram_device::nvram_default()
case DEFAULT_RANDOM:
{
UINT8 *nvram = reinterpret_cast<UINT8 *>(m_base);
- for (int index = 0; index < m_length; index++)
+ for (size_t index = 0; index < m_length; index++)
nvram[index] = machine().rand();
break;
}
diff --git a/src/emu/machine/pckeybrd.c b/src/emu/machine/pckeybrd.c
index d41e7a12ed3..315add160b5 100644
--- a/src/emu/machine/pckeybrd.c
+++ b/src/emu/machine/pckeybrd.c
@@ -1033,7 +1033,7 @@ UINT8 pc_keyboard_device::unicode_char_to_at_keycode(unicode_char ch)
int pc_keyboard_device::queue_chars(const unicode_char *text, size_t text_len)
{
- int i;
+ size_t i;
UINT8 b;
for (i = 0; (i < text_len) && ((queue_size()) + 4 < sizeof(m_queue)); i++)
diff --git a/src/emu/netlist/pstring.c b/src/emu/netlist/pstring.c
index c1bc1e031db..f2f492bccab 100644
--- a/src/emu/netlist/pstring.c
+++ b/src/emu/netlist/pstring.c
@@ -207,7 +207,7 @@ void *pblockpool::alloc(const std::size_t n)
else
{
int memsize = ((n + m_align - 1) / m_align) * m_align;
- int min_alloc = MAX(m_blocksize, memsize+sizeof(memblock)-MINDATASIZE);
+ int min_alloc = MAX((size_t)m_blocksize, (memsize+sizeof(memblock)-MINDATASIZE));
char *ret = NULL;
//std::printf("m_first %p\n", m_first);
for (memblock *p = m_first; p != NULL && ret == NULL; p = p->next)
diff --git a/src/emu/uiinput.c b/src/emu/uiinput.c
index 28e33c08971..20b09d96d1b 100644
--- a/src/emu/uiinput.c
+++ b/src/emu/uiinput.c
@@ -153,7 +153,7 @@ bool ui_input_push_event(running_machine &machine, ui_event evt)
}
/* is the queue filled up? */
- if ((uidata->events_end + 1) % ARRAY_LENGTH(uidata->events) == uidata->events_start)
+ if ((uidata->events_end + 1) % ARRAY_LENGTH(uidata->events) == (size_t)uidata->events_start)
return false;
uidata->events[uidata->events_end++] = evt;
diff --git a/src/emu/video/pc_vga.c b/src/emu/video/pc_vga.c
index 601b2790c76..286c23752a6 100644
--- a/src/emu/video/pc_vga.c
+++ b/src/emu/video/pc_vga.c
@@ -600,7 +600,8 @@ void vga_device::vga_vh_mono(bitmap_rgb32 &bitmap, const rectangle &cliprect)
void svga_device::svga_vh_rgb8(bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
- int pos, line, column, c, addr, curr_addr;
+ size_t pos;
+ int line, column, c, addr, curr_addr;
UINT32 *bitmapline;
UINT16 mask_comp;
int height = vga.crtc.maximum_scan_line * (vga.crtc.scan_doubling + 1);
@@ -658,7 +659,8 @@ void svga_device::svga_vh_rgb15(bitmap_rgb32 &bitmap, const rectangle &cliprect)
int xi;
int yi;
int xm;
- int pos, line, column, c, addr, curr_addr;
+ size_t pos;
+ int line, column, c, addr, curr_addr;
UINT32 *bitmapline;
// UINT16 mask_comp;
@@ -702,7 +704,8 @@ void svga_device::svga_vh_rgb16(bitmap_rgb32 &bitmap, const rectangle &cliprect)
int xi;
int yi;
int xm;
- int pos, line, column, c, addr, curr_addr;
+ size_t pos;
+ int line, column, c, addr, curr_addr;
UINT32 *bitmapline;
// UINT16 mask_comp;
@@ -746,7 +749,8 @@ void svga_device::svga_vh_rgb24(bitmap_rgb32 &bitmap, const rectangle &cliprect)
int xi;
int yi;
int xm;
- int pos, line, column, c, addr, curr_addr;
+ size_t pos;
+ int line, column, c, addr, curr_addr;
UINT32 *bitmapline;
// UINT16 mask_comp;
@@ -787,7 +791,8 @@ void svga_device::svga_vh_rgb32(bitmap_rgb32 &bitmap, const rectangle &cliprect)
int xi;
int yi;
int xm;
- int pos, line, column, c, addr, curr_addr;
+ size_t pos;
+ int line, column, c, addr, curr_addr;
UINT32 *bitmapline;
// UINT16 mask_comp;
diff --git a/src/emu/video/vic4567.c b/src/emu/video/vic4567.c
index 1e3050ab0f9..57fdc90fb82 100644
--- a/src/emu/video/vic4567.c
+++ b/src/emu/video/vic4567.c
@@ -802,7 +802,7 @@ void vic3_device::draw_sprite_multi( int nr, int yoff, int ybegin, int yend, int
#ifndef memset16
static void *memset16(void *dest, int value, size_t size)
{
- register int i;
+ size_t i;
for (i = 0; i < size; i++)
((short *) dest)[i] = value;
diff --git a/src/lib/formats/ap_dsk35.c b/src/lib/formats/ap_dsk35.c
index c286fa55f21..9ef82061119 100644
--- a/src/lib/formats/ap_dsk35.c
+++ b/src/lib/formats/ap_dsk35.c
@@ -664,7 +664,8 @@ static floperr_t apple35_write_track(floppy_image_legacy *floppy, int head, int
{
floperr_t err;
size_t pos = 0;
- int sector_count, sector, i, j;
+ int sector_count, sector, i;
+ size_t j;
struct apple35_tag *tag;
UINT8 sum, format_byte, val, side;
UINT32 found_sectors = 0;
diff --git a/src/lib/formats/cassimg.c b/src/lib/formats/cassimg.c
index b7f1ea68ccd..6b94394ed91 100644
--- a/src/lib/formats/cassimg.c
+++ b/src/lib/formats/cassimg.c
@@ -377,7 +377,7 @@ static casserr_t lookup_sample(cassette_image *cassette, int channel, size_t sam
size_t sample_index = sample % SAMPLES_PER_BLOCK;
/* is this block beyond the edge of our waveform? */
- if (sample_blocknum >= cassette->blocks.count())
+ if (sample_blocknum >= (size_t)cassette->blocks.count())
cassette->blocks.resize_keep_and_clear_new(sample_blocknum + 1);
if (cassette->blocks[sample_blocknum] == NULL)
@@ -386,7 +386,7 @@ static casserr_t lookup_sample(cassette_image *cassette, int channel, size_t sam
sample_block &block = *cassette->blocks[sample_blocknum];
/* is this sample access off the current block? */
- if (sample_index >= block.count())
+ if (sample_index >= (size_t)block.count())
block.resize_keep_and_clear_new(SAMPLES_PER_BLOCK);
*ptr = &block[sample_index];
diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c
index ca9af339518..db96124a745 100644
--- a/src/lib/formats/flopimg.c
+++ b/src/lib/formats/flopimg.c
@@ -114,7 +114,7 @@ static floperr_t floppy_open_internal(void *fp, const struct io_procs *procs, co
}
/* vote on the best format */
- for (i = 0; (i < max_options) && floppy_options[i].construct; i++)
+ for (i = 0; (i < (size_t)max_options) && floppy_options[i].construct; i++)
{
if (!extension || !floppy_options[i].extensions || image_find_extension(floppy_options[i].extensions, extension))
{
diff --git a/src/lib/formats/thom_cas.c b/src/lib/formats/thom_cas.c
index 301b3de7d10..02e5821b82b 100644
--- a/src/lib/formats/thom_cas.c
+++ b/src/lib/formats/thom_cas.c
@@ -202,7 +202,7 @@ static casserr_t to7_k7_load( cassette_image *cass )
cassette_image_read( cass, block, 0, 64 );
for ( i = 3; ; i++ )
{
- if ( ( i >= size ) || ( i >= 64 ) )
+ if ( ( (size_t)i >= size ) || ( i >= 64 ) )
{
/* ? */
PRINT (( "to7_k7_load: WARNING: this does not look like a MO or TO cassette.\n" ));
@@ -534,7 +534,7 @@ static casserr_t mo5_k5_load( cassette_image *cass )
cassette_image_read( cass, block, 0, 64 );
for ( i = 3; ; i++ )
{
- if ( ( i >= size ) || ( i >= 64 ) )
+ if ( ( (size_t)i >= size ) || ( i >= 64 ) )
{
/* ? */
PRINT (( "to5_k5_load: WARNING: this does not look like a MO or TO cassette.\n" ));
diff --git a/src/lib/formats/thom_dsk.c b/src/lib/formats/thom_dsk.c
index b3cf47234a2..e789f23682f 100644
--- a/src/lib/formats/thom_dsk.c
+++ b/src/lib/formats/thom_dsk.c
@@ -105,7 +105,7 @@ static floperr_t internal_sap_read_sector(floppy_image_legacy *floppy, int head,
{
UINT64 offset;
floperr_t err;
- int i;
+ size_t i;
UINT8 *buf;
err = get_offset(floppy, head, track, sector, sector_is_index, &offset);
if (err)
@@ -127,7 +127,7 @@ static floperr_t internal_sap_write_sector(floppy_image_legacy *floppy, int head
floperr_t err;
UINT8 buf[256+6];
UINT16 crc;
- int i;
+ size_t i;
err = get_offset(floppy, head, track, sector, sector_is_index, &offset);
if (err)
return err;
diff --git a/src/lib/formats/ti99_dsk.c b/src/lib/formats/ti99_dsk.c
index b1b8cec589b..23b2c970281 100644
--- a/src/lib/formats/ti99_dsk.c
+++ b/src/lib/formats/ti99_dsk.c
@@ -1505,7 +1505,7 @@ static floperr_t ti99_sdf_read_track(floppy_image_legacy *floppy, int head, int
*/
static floperr_t ti99_sdf_write_track(floppy_image_legacy *floppy, int head, int track, UINT64 offset, const void *buffer, size_t buflen)
{
- int current_pos = 0;
+ size_t current_pos = 0;
UINT8 *track_image;
int leadin, gap1, gap2;
int is_fm, found;
@@ -2128,7 +2128,8 @@ static floperr_t ti99_tdf_read_track_internal(floppy_image_legacy *floppy, int h
UINT64 track_offset;
int first_idam = 0;
struct ti99dsk_tag *tag = (ti99dsk_tag*)floppy_tag(floppy);
- int i, byte, crc;
+ size_t i;
+ int byte, crc;
UINT8 *track_data = (UINT8*)buffer;
diff --git a/src/lib/util/chdcd.c b/src/lib/util/chdcd.c
index 9059d65aacb..13176bac554 100644
--- a/src/lib/util/chdcd.c
+++ b/src/lib/util/chdcd.c
@@ -995,7 +995,7 @@ chd_error chdcd_parse_cue(const char *tocfname, cdrom_toc &outtoc, chdcd_track_i
chd_error chdcd_parse_toc(const char *tocfname, cdrom_toc &outtoc, chdcd_track_input_info &outinfo)
{
FILE *infile;
- int i, trknum;
+ size_t i, trknum;
static char token[512];
char tocftemp[512];
diff --git a/src/lib/util/opresolv.c b/src/lib/util/opresolv.c
index 4d093a955da..6d011c7adb8 100644
--- a/src/lib/util/opresolv.c
+++ b/src/lib/util/opresolv.c
@@ -249,7 +249,7 @@ outofmemory:
optreserr_t option_resolution_add_param(option_resolution *resolution, const char *param, const char *value)
{
- int i;
+ size_t i;
int must_resolve;
optreserr_t err;
const char *option_specification;
@@ -344,7 +344,7 @@ void option_resolution_close(option_resolution *resolution)
optreserr_t option_resolution_finish(option_resolution *resolution)
{
- int i;
+ size_t i;
optreserr_t err;
struct option_resolution_entry *entry;
const char *option_specification;
@@ -445,7 +445,7 @@ const option_guide *option_resolution_find_option(option_resolution *resolution,
const option_guide *option_resolution_index_option(option_resolution *resolution, int indx)
{
- if ((indx < 0) || (indx >= resolution->option_count))
+ if ((indx < 0) || ((size_t)indx >= resolution->option_count))
return NULL;
return resolution->entries[indx].guide_entry;
}
diff --git a/src/lib/util/un7z.c b/src/lib/util/un7z.c
index 149ead60e4d..4dfb4c2d8db 100644
--- a/src/lib/util/un7z.c
+++ b/src/lib/util/un7z.c
@@ -220,7 +220,7 @@ int _7z_search_crc_match(_7z_file *new_7z, UINT32 search_crc, const char* search
/* Check for a name match */
SzArEx_GetFileNameUtf16(&new_7z->db, i, temp);
- if (len == search_filename_length+1)
+ if (len == (size_t)search_filename_length+1)
{
int j;
for (j=0;j<search_filename_length;j++)
diff --git a/src/lib/util/unicode.c b/src/lib/util/unicode.c
index c87965415d7..8ffae847141 100644
--- a/src/lib/util/unicode.c
+++ b/src/lib/util/unicode.c
@@ -30,7 +30,7 @@ int uchar_isvalid(unicode_char uchar)
int uchar_from_utf8(unicode_char *uchar, const char *utf8char, size_t count)
{
unicode_char c, minchar;
- int auxlen, i;
+ size_t auxlen, i;
char auxchar;
/* validate parameters */
diff --git a/src/lib/util/zippath.c b/src/lib/util/zippath.c
index 69eea2fa20b..3edd688f791 100644
--- a/src/lib/util/zippath.c
+++ b/src/lib/util/zippath.c
@@ -697,7 +697,7 @@ void zippath_closedir(zippath_directory *directory)
static const char *get_relative_path(zippath_directory *directory, const zip_file_header *header)
{
const char *result = NULL;
- int len = directory->zipprefix.len();
+ size_t len = directory->zipprefix.len();
if ((len <= strlen(header->filename))
&& !strncmp(directory->zipprefix, header->filename, len))
diff --git a/src/mame/drivers/astrafr.c b/src/mame/drivers/astrafr.c
index b6d6f532a76..d1a9b0ea1b1 100644
--- a/src/mame/drivers/astrafr.c
+++ b/src/mame/drivers/astrafr.c
@@ -2097,7 +2097,7 @@ void astra_addresslines( UINT16* src, size_t srcsize, int small )
if (small) blocksize= 0x100000/2;
else blocksize= 0x100000;
- for (int block = 0; block < srcsize; block += blocksize)
+ for (size_t block = 0; block < srcsize; block += blocksize)
{
for (int x = 0; x<blocksize/2;x+=2)
{
diff --git a/src/mame/drivers/blmbycar.c b/src/mame/drivers/blmbycar.c
index 98bfb1b2600..dacfd6a2b99 100644
--- a/src/mame/drivers/blmbycar.c
+++ b/src/mame/drivers/blmbycar.c
@@ -512,7 +512,7 @@ DRIVER_INIT_MEMBER(blmbycar_state,blmbycar)
{
UINT16 *RAM = (UINT16 *) memregion("maincpu")->base();
size_t size = memregion("maincpu")->bytes() / 2;
- int i;
+ size_t i;
for (i = 0; i < size; i++)
{
diff --git a/src/mame/drivers/coolridr.c b/src/mame/drivers/coolridr.c
index ff475a3819a..9c2f13fcd61 100644
--- a/src/mame/drivers/coolridr.c
+++ b/src/mame/drivers/coolridr.c
@@ -3483,7 +3483,7 @@ void coolridr_state::machine_start()
UINT16* compressed = (UINT16*)memregion( "compressedgfx" )->base();
int count = 0;
- for (int i=0;i<size/2/10;i++)
+ for (size_t i=0;i<size/2/10;i++)
{
m_rearranged_16bit_gfx[count+0] = ((compressed[i+((0x0400000/2)*0)]&0x00ff) << 8) | ((compressed[i+((0x0400000/2)*0)]&0xff00) >> 8);
m_rearranged_16bit_gfx[count+1] = ((compressed[i+((0x0400000/2)*1)]&0x00ff) << 8) | ((compressed[i+((0x0400000/2)*1)]&0xff00) >> 8);
diff --git a/src/mame/drivers/ddenlovr.c b/src/mame/drivers/ddenlovr.c
index 477a633d25f..e52db100325 100644
--- a/src/mame/drivers/ddenlovr.c
+++ b/src/mame/drivers/ddenlovr.c
@@ -1465,7 +1465,7 @@ READ8_MEMBER(ddenlovr_state::rongrong_gfxrom_r)
{
UINT8 *rom = memregion("blitter")->base();
size_t size = memregion("blitter")->bytes();
- int address = m_ddenlovr_blit_address;
+ size_t address = m_ddenlovr_blit_address;
if (address >= size)
{
@@ -2655,7 +2655,7 @@ READ8_MEMBER(ddenlovr_state::hanakanz_gfxrom_r)
{
UINT8 *rom = memregion("blitter")->base();
size_t size = memregion("blitter")->bytes();
- int address = (m_ddenlovr_blit_address & 0xffffff) * 2;
+ size_t address = (m_ddenlovr_blit_address & 0xffffff) * 2;
if (address >= size)
{
@@ -2879,7 +2879,7 @@ void ddenlovr_state::mjchuuka_get_romdata()
{
UINT8 *rom = memregion("blitter")->base();
size_t size = memregion("blitter")->bytes();
- int address = (m_ddenlovr_blit_address & 0xffffff) * 2;
+ size_t address = (m_ddenlovr_blit_address & 0xffffff) * 2;
if (address >= size)
{
diff --git a/src/mame/drivers/dynax.c b/src/mame/drivers/dynax.c
index 7f79d9695b5..d350e36a93b 100644
--- a/src/mame/drivers/dynax.c
+++ b/src/mame/drivers/dynax.c
@@ -5898,7 +5898,7 @@ ROM_END
// Decrypted by yong
DRIVER_INIT_MEMBER(dynax_state,mjelct3)
{
- int i;
+ size_t i;
UINT8 *rom = memregion("maincpu")->base();
size_t size = memregion("maincpu")->bytes();
dynamic_buffer rom1(size);
@@ -5910,7 +5910,7 @@ DRIVER_INIT_MEMBER(dynax_state,mjelct3)
DRIVER_INIT_MEMBER(dynax_state,mjelct3a)
{
- int i, j;
+ size_t i, j;
UINT8 *rom = memregion("maincpu")->base();
size_t size = memregion("maincpu")->bytes();
dynamic_buffer rom1(size);
diff --git a/src/mame/drivers/fantland.c b/src/mame/drivers/fantland.c
index b4ab05d2608..107917a86b3 100644
--- a/src/mame/drivers/fantland.c
+++ b/src/mame/drivers/fantland.c
@@ -360,7 +360,7 @@ void fantland_state::borntofi_adpcm_int( msm5205_device *device, int voice )
{
UINT8 *rom;
size_t len;
- int start, stop;
+ size_t start, stop;
if (!m_adpcm_playing[voice])
return;
diff --git a/src/mame/drivers/gaiden.c b/src/mame/drivers/gaiden.c
index 0976a1a096c..094ae68ed3a 100644
--- a/src/mame/drivers/gaiden.c
+++ b/src/mame/drivers/gaiden.c
@@ -1508,7 +1508,7 @@ DRIVER_INIT_MEMBER(gaiden_state,raiga)
void gaiden_state::descramble_drgnbowl_gfx()
{
- int i;
+ size_t i;
UINT8 *ROM = memregion("maincpu")->base();
size_t size = memregion("maincpu")->bytes();
diff --git a/src/mame/drivers/hng64.c b/src/mame/drivers/hng64.c
index fbb27e4d3e6..fad852af74d 100644
--- a/src/mame/drivers/hng64.c
+++ b/src/mame/drivers/hng64.c
@@ -1736,7 +1736,7 @@ static void hng64_reorder(running_machine &machine, UINT8* gfxregion, size_t gfx
{
// by default 2 4bpp tiles are stored in each 8bpp tile, this makes decoding in MAME harder than it needs to be
// reorder them
- int i;
+ size_t i;
UINT8 tilesize = 4*8; // 4 bytes per line, 8 lines
dynamic_buffer buffer(gfxregionsize);
diff --git a/src/mame/drivers/igs009.c b/src/mame/drivers/igs009.c
index 6f6407fe515..45c2d782b28 100644
--- a/src/mame/drivers/igs009.c
+++ b/src/mame/drivers/igs009.c
@@ -845,7 +845,7 @@ ROM_END
DRIVER_INIT_MEMBER(igs009_state,jingbell)
{
- int i;
+ size_t i;
UINT8 *rom = (UINT8 *)memregion("maincpu")->base();
size_t size = memregion("maincpu")->bytes();
diff --git a/src/mame/drivers/itech32.c b/src/mame/drivers/itech32.c
index 9bcc71f9d20..75b381daebe 100644
--- a/src/mame/drivers/itech32.c
+++ b/src/mame/drivers/itech32.c
@@ -852,7 +852,7 @@ void itech32_state::nvram_init(nvram_device &nvram, void *base, size_t length)
{
// if nvram is the main RAM, don't overwrite exception vectors
int start = (base == m_main_ram) ? 0x80 : 0x00;
- for (int i = start; i < length; i++)
+ for (size_t i = start; i < length; i++)
((UINT8 *)base)[i] = machine().rand();
// due to accessing uninitialized RAM, we need this hack
diff --git a/src/mame/drivers/jclub2.c b/src/mame/drivers/jclub2.c
index 47be6834e07..eb2ba565cc0 100644
--- a/src/mame/drivers/jclub2.c
+++ b/src/mame/drivers/jclub2.c
@@ -1320,7 +1320,7 @@ DRIVER_INIT_MEMBER(darkhors_state,darkhors)
{
size_t len = memregion("eeprom")->bytes();
dynamic_buffer temp(len);
- int i;
+ size_t i;
for (i = 0; i < len; i++)
temp[i] = eeprom[BITSWAP8(i,7,5,4,3,2,1,0,6)];
diff --git a/src/mame/drivers/nmk16.c b/src/mame/drivers/nmk16.c
index 57f09316d4d..5ba6f766d24 100644
--- a/src/mame/drivers/nmk16.c
+++ b/src/mame/drivers/nmk16.c
@@ -5109,7 +5109,7 @@ MACHINE_CONFIG_END
static void decryptcode( running_machine &machine, int a23, int a22, int a21, int a20, int a19, int a18, int a17, int a16, int a15, int a14, int a13, int a12,
int a11, int a10, int a9, int a8, int a7, int a6, int a5, int a4, int a3, int a2, int a1, int a0 )
{
- int i;
+ size_t i;
UINT8 *RAM = machine.root_device().memregion( "maincpu" )->base();
size_t size = machine.root_device().memregion( "maincpu" )->bytes();
dynamic_buffer buffer( size );
diff --git a/src/mame/drivers/pgm.c b/src/mame/drivers/pgm.c
index c2e0d0ee65f..fb2d488980c 100644
--- a/src/mame/drivers/pgm.c
+++ b/src/mame/drivers/pgm.c
@@ -3989,7 +3989,7 @@ void pgm_state::expand_colourdata()
{
UINT8 *src = memregion( "sprcol" )->base();
size_t srcsize = memregion( "sprcol" )->bytes();
- int cnt;
+ size_t cnt;
size_t needed = srcsize / 2 * 3;
/* work out how much ram we need to allocate to expand the sprites into
diff --git a/src/mame/drivers/pirates.c b/src/mame/drivers/pirates.c
index 8a3716da4a7..833ca30b471 100644
--- a/src/mame/drivers/pirates.c
+++ b/src/mame/drivers/pirates.c
@@ -331,7 +331,7 @@ void pirates_state::pirates_decrypt_68k()
memcpy (buf, rom, rom_size);
- for (int i=0; i<rom_size/2; i++)
+ for (size_t i=0; i<rom_size/2; i++)
{
int adrl, adrr;
UINT8 vl, vr;
diff --git a/src/mame/drivers/puckpkmn.c b/src/mame/drivers/puckpkmn.c
index 75731c0c8d8..4cb6b035240 100644
--- a/src/mame/drivers/puckpkmn.c
+++ b/src/mame/drivers/puckpkmn.c
@@ -377,7 +377,7 @@ DRIVER_INIT_MEMBER(md_boot_state,puckpkmn)
{
UINT8 *rom = memregion("maincpu")->base();
size_t len = memregion("maincpu")->bytes();
- int i;
+ size_t i;
for (i = 0; i < len; i++)
rom[i] = BITSWAP8(rom[i],1,4,2,0,7,5,3,6);
diff --git a/src/mame/drivers/tecmosys.c b/src/mame/drivers/tecmosys.c
index d32faba10c9..019edb9c620 100644
--- a/src/mame/drivers/tecmosys.c
+++ b/src/mame/drivers/tecmosys.c
@@ -624,7 +624,7 @@ void tecmosys_state::tecmosys_descramble()
{
UINT8 *gfxsrc = memregion( "gfx1" )->base();
size_t srcsize = memregion( "gfx1" )->bytes();
- int i;
+ size_t i;
for (i=0; i < srcsize; i+=4)
{
diff --git a/src/mame/drivers/wecleman.c b/src/mame/drivers/wecleman.c
index e46debb5a30..c73c8b13cac 100644
--- a/src/mame/drivers/wecleman.c
+++ b/src/mame/drivers/wecleman.c
@@ -1302,7 +1302,7 @@ void wecleman_state::wecleman_unpack_sprites()
void wecleman_state::bitswap(UINT8 *src,size_t len,int _14,int _13,int _12,int _11,int _10,int _f,int _e,int _d,int _c,int _b,int _a,int _9,int _8,int _7,int _6,int _5,int _4,int _3,int _2,int _1,int _0)
{
dynamic_buffer buffer(len);
- int i;
+ size_t i;
memcpy(buffer,src,len);
for (i = 0;i < len;i++)
diff --git a/src/mame/machine/neocrypt.c b/src/mame/machine/neocrypt.c
index eb881ec7dff..260b958a271 100644
--- a/src/mame/machine/neocrypt.c
+++ b/src/mame/machine/neocrypt.c
@@ -685,7 +685,7 @@ void neogeo_state::svcpcb_gfx_decrypt()
/* and a further swap on the s1 data */
void neogeo_state::svcpcb_s1data_decrypt()
{
- int i;
+ size_t i;
UINT8 *s1 = memregion( "fixed" )->base();
size_t s1_size = memregion( "fixed" )->bytes();
diff --git a/src/mame/machine/scramble.c b/src/mame/machine/scramble.c
index 1588999a577..315a2098815 100644
--- a/src/mame/machine/scramble.c
+++ b/src/mame/machine/scramble.c
@@ -673,7 +673,7 @@ DRIVER_INIT_MEMBER(scramble_state,harem)
UINT8 *opcodes = m_harem_decrypted_opcodes = auto_alloc_array(machine(), UINT8, size * 3);
// decryption 03
- for (int i = 0; i < size; i++)
+ for (size_t i = 0; i < size; i++)
{
UINT8 x = ROM[i];
opcodes[size * 0 + i] = BITSWAP8(x, 7,0,5,2,3,4,1,6);
@@ -681,7 +681,7 @@ DRIVER_INIT_MEMBER(scramble_state,harem)
}
// decryption 09
- for (int i = 0; i < size; i++)
+ for (size_t i = 0; i < size; i++)
{
UINT8 x = ROM[i];
opcodes[size * 1 + i] = BITSWAP8(x, 7,0,5,6,3,2,1,4);
@@ -689,7 +689,7 @@ DRIVER_INIT_MEMBER(scramble_state,harem)
}
// decryption 0a
- for (int i = 0; i < size; i++)
+ for (size_t i = 0; i < size; i++)
{
UINT8 x = ROM[i];
opcodes[size * 2 + i] = BITSWAP8(x, 7,2,5,6,3,0,1,4);
diff --git a/src/mame/video/dynax.c b/src/mame/video/dynax.c
index 9d2d7f4fa2a..9b703ca3a93 100644
--- a/src/mame/video/dynax.c
+++ b/src/mame/video/dynax.c
@@ -451,7 +451,7 @@ int dynax_state::blitter_drawgfx( int layer, int mask, const char *gfx, int src,
for ( ;; )
{
- if (src >= ROM_size)
+ if ((size_t)src >= ROM_size)
{
popmessage("GFXROM %s OVER %08x",gfx,src);
LOG(("\nGFXROM %s OVER %08x",gfx,src));
@@ -479,7 +479,7 @@ int dynax_state::blitter_drawgfx( int layer, int mask, const char *gfx, int src,
popmessage("Blitter unknown command %06X: %02X\n", src - 1, cmd);
case 0xd: // Skip X pixels
- if (src >= ROM_size)
+ if ((size_t)src >= ROM_size)
{
popmessage("GFXROM %s OVER %08x",gfx,src);
LOG(("\nGFXROM %s OVER %08x",gfx,src));
@@ -490,7 +490,7 @@ int dynax_state::blitter_drawgfx( int layer, int mask, const char *gfx, int src,
/* fall through into next case */
case 0xc: // Draw N pixels
- if (src >= ROM_size)
+ if ((size_t)src >= ROM_size)
{
popmessage("GFXROM %s OVER %08x",gfx,src);
LOG(("\nGFXROM %s OVER %08x",gfx,src));
diff --git a/src/mess/drivers/a2600.c b/src/mess/drivers/a2600.c
index 2496c5570e4..2e151b211e3 100644
--- a/src/mess/drivers/a2600.c
+++ b/src/mess/drivers/a2600.c
@@ -210,7 +210,8 @@ static const UINT16 supported_screen_heights[4] = { 262, 312, 328, 342 };
int a2600_state::detect_modeDC()
{
- int i,numfound = 0;
+ size_t i;
+ int numfound = 0;
// signature is also in 'video reflex'.. maybe figure out that controller port someday...
static const unsigned char signature[3] = { 0x8d, 0xf0, 0xff };
if (m_cart_size == 0x10000)
@@ -230,7 +231,8 @@ int a2600_state::detect_modeDC()
int a2600_state::detect_modef6()
{
- int i, numfound = 0;
+ size_t i;
+ int numfound = 0;
static const unsigned char signature[3] = { 0x8d, 0xf6, 0xff };
if (m_cart_size == 0x4000)
{
@@ -253,7 +255,8 @@ int a2600_state::detect_mode3E()
// 'not boulderdash', but is the only example i have (cow)
// Would have used STA $3e, but 'Alien' and 'Star Raiders' do that for unknown reasons
- int i,numfound = 0;
+ size_t i;
+ int numfound = 0;
static const unsigned char signature[3] = { 0x84, 0x3e, 0x9d };
if (m_cart_size == 0x0800 || m_cart_size == 0x1000)
{
@@ -272,7 +275,8 @@ int a2600_state::detect_mode3E()
int a2600_state::detect_modeSS()
{
- int i,numfound = 0;
+ size_t i;
+ int numfound = 0;
static const unsigned char signature[5] = { 0xbd, 0xe5, 0xff, 0x95, 0x81 };
if (m_cart_size == 0x0800 || m_cart_size == 0x1000)
{
@@ -291,7 +295,8 @@ int a2600_state::detect_modeSS()
int a2600_state::detect_modeFE()
{
- int i,j,numfound = 0;
+ size_t i,j;
+ int numfound = 0;
static const unsigned char signatures[][5] = {
{ 0x20, 0x00, 0xd0, 0xc6, 0xc5 },
{ 0x20, 0xc3, 0xf8, 0xa5, 0x82 },
@@ -318,7 +323,8 @@ int a2600_state::detect_modeFE()
int a2600_state::detect_modeE0()
{
- int i,j,numfound = 0;
+ size_t i,j;
+ int numfound = 0;
static const unsigned char signatures[][3] = {
{ 0x8d, 0xe0, 0x1f },
{ 0x8d, 0xe0, 0x5f },
@@ -347,7 +353,8 @@ int a2600_state::detect_modeE0()
int a2600_state::detect_modeCV()
{
- int i,j,numfound = 0;
+ size_t i,j;
+ int numfound = 0;
static const unsigned char signatures[][3] = {
{ 0x9d, 0xff, 0xf3 },
{ 0x99, 0x00, 0xf4 }
@@ -372,7 +379,8 @@ int a2600_state::detect_modeCV()
int a2600_state::detect_modeFV()
{
- int i,j,numfound = 0;
+ size_t i,j;
+ int numfound = 0;
static const unsigned char signatures[][3] = {
{ 0x2c, 0xd0, 0xff }
};
@@ -397,7 +405,8 @@ int a2600_state::detect_modeFV()
int a2600_state::detect_modeJVP()
{
- int i,j,numfound = 0;
+ size_t i,j;
+ int numfound = 0;
static const unsigned char signatures[][4] = {
{ 0x2c, 0xc0, 0xef, 0x60 },
{ 0x8d, 0xa0, 0x0f, 0xf0 }
@@ -422,7 +431,8 @@ int a2600_state::detect_modeJVP()
int a2600_state::detect_modeE7()
{
- int i,j,numfound = 0;
+ size_t i,j;
+ int numfound = 0;
static const unsigned char signatures[][3] = {
{ 0xad, 0xe5, 0xff },
{ 0x8d, 0xe7, 0xff }
@@ -447,7 +457,8 @@ int a2600_state::detect_modeE7()
int a2600_state::detect_modeUA()
{
- int i,numfound = 0;
+ size_t i;
+ int numfound = 0;
static const unsigned char signature[3] = { 0x8d, 0x40, 0x02 };
if (m_cart_size == 0x2000)
{
@@ -466,7 +477,8 @@ int a2600_state::detect_modeUA()
int a2600_state::detect_8K_mode3F()
{
- int i,numfound = 0;
+ size_t i;
+ int numfound = 0;
static const unsigned char signature1[4] = { 0xa9, 0x01, 0x85, 0x3f };
static const unsigned char signature2[4] = { 0xa9, 0x02, 0x85, 0x3f };
// have to look for two signatures because 'not boulderdash' gives false positive otherwise
@@ -491,7 +503,8 @@ int a2600_state::detect_8K_mode3F()
int a2600_state::detect_32K_mode3F()
{
- int i,numfound = 0;
+ size_t i;
+ int numfound = 0;
static const unsigned char signature[4] = { 0xa9, 0x0e, 0x85, 0x3f };
if (m_cart_size >= 0x8000)
{
@@ -510,7 +523,7 @@ int a2600_state::detect_32K_mode3F()
int a2600_state::detect_super_chip()
{
- int i,j;
+ size_t i,j;
UINT8 *cart = CART;
static const unsigned char signatures[][5] = {
{ 0xa2, 0x7f, 0x9d, 0x00, 0xf0 }, // dig dug
diff --git a/src/mess/drivers/pockstat.c b/src/mess/drivers/pockstat.c
index cc4ce551a17..0600d0370b0 100644
--- a/src/mess/drivers/pockstat.c
+++ b/src/mess/drivers/pockstat.c
@@ -946,7 +946,7 @@ UINT32 pockstat_state::screen_update_pockstat(screen_device &screen, bitmap_rgb3
DEVICE_IMAGE_LOAD_MEMBER( pockstat_state, pockstat_flash )
{
- int i, length;
+ int length;
UINT8 *cart = memregion("flash")->base();
static const char *gme_id = "123-456-STD";
@@ -957,7 +957,7 @@ DEVICE_IMAGE_LOAD_MEMBER( pockstat_state, pockstat_flash )
return IMAGE_INIT_FAIL;
}
- for(i = 0; i < strlen(gme_id); i++)
+ for(size_t i = 0; i < strlen(gme_id); i++)
{
if(cart[i] != gme_id[i])
{
diff --git a/src/mess/drivers/ssem.c b/src/mess/drivers/ssem.c
index 0373cef9c05..a7a8f1e4980 100644
--- a/src/mess/drivers/ssem.c
+++ b/src/mess/drivers/ssem.c
@@ -405,7 +405,7 @@ void ssem_state::glyph_print(bitmap_rgb32 &bitmap, INT32 x, INT32 y, const char
{
va_list arg_list;
char buf[32768];
- INT32 index = 0;
+ size_t index = 0;
const rectangle &visarea = m_screen->visible_area();
va_start( arg_list, msg );
@@ -502,9 +502,8 @@ UINT32 ssem_state::screen_update_ssem(screen_device &screen, bitmap_rgb32 &bitma
void ssem_state::strlower(char *buf)
{
if(buf)
- {
- int i = 0;
- for(i = 0; i < strlen(buf); i++)
+ {
+ for(size_t i = 0; i < strlen(buf); i++)
{
if(buf[i] >= 'A' && buf[i] <= 'Z')
{
diff --git a/src/mess/drivers/svmu.c b/src/mess/drivers/svmu.c
index e7ad33117f2..ab0123c1e24 100644
--- a/src/mess/drivers/svmu.c
+++ b/src/mess/drivers/svmu.c
@@ -271,7 +271,7 @@ QUICKLOAD_LOAD_MEMBER( svmu_state, svmu )
vmufat_write_word(flash, 253, 0x02, 0x0000); // location of first file block
const char *vms_filename = image.basename_noext();
- for (int i=0; i<12; i++)
+ for (size_t i=0; i<12; i++)
{
if (i < strlen(vms_filename))
vmufat_write_byte(flash, 253, i + 4, vms_filename[i]); // 12 bytes filename
diff --git a/src/mess/tools/imgtool/modules/bml3.c b/src/mess/tools/imgtool/modules/bml3.c
index d7efba94f78..f733db796b7 100644
--- a/src/mess/tools/imgtool/modules/bml3.c
+++ b/src/mess/tools/imgtool/modules/bml3.c
@@ -766,7 +766,7 @@ static imgtoolerr_t bml3_diskimage_writefile(imgtool_partition *partition, const
read_sz -= i;
sz -= i;
}
- if (i < info->granule_sectors * info->sector_size && sz > 0) {
+ if (i < (size_t)(info->granule_sectors * info->sector_size) && sz > 0) {
// write EOF and trailing NULs in the final sector
ferr = write_granule(img, g, i, (info->granule_sectors * info->sector_size - i - 1) % info->sector_size + 1, eof_buf);
if (ferr)
diff --git a/src/mess/tools/imgtool/modules/fat.c b/src/mess/tools/imgtool/modules/fat.c
index 660a5a890ae..8825385aa6c 100644
--- a/src/mess/tools/imgtool/modules/fat.c
+++ b/src/mess/tools/imgtool/modules/fat.c
@@ -894,7 +894,7 @@ static imgtoolerr_t fat_readwrite_file(imgtool_partition *partition, fat_file *f
return fat_corrupt_file_error(file);
offset = file->index % FAT_SECLEN;
- len = MIN(buffer_len, FAT_SECLEN - offset);
+ len = MIN(buffer_len, (size_t(FAT_SECLEN - offset)));
/* read or write the data from the disk */
if (read_or_write)
@@ -1196,7 +1196,7 @@ static UINT8 fat_calc_filename_checksum(const UINT8 *short_filename)
static void fat_calc_dirent_lfnchecksum(UINT8 *entry, size_t entry_len)
{
UINT8 checksum;
- int i;
+ size_t i;
checksum = fat_calc_filename_checksum(entry + entry_len - FAT_DIRENT_SIZE);
diff --git a/src/mess/tools/imgtool/modules/mac.c b/src/mess/tools/imgtool/modules/mac.c
index 81af01761a4..13fe754ebcb 100644
--- a/src/mess/tools/imgtool/modules/mac.c
+++ b/src/mess/tools/imgtool/modules/mac.c
@@ -337,7 +337,7 @@ enum
*/
static void mac_to_c_strncpy(char *dst, int n, UINT8 *src)
{
- size_t len = src[0];
+ int len = src[0];
int i, j;
i = j = 0;
@@ -554,12 +554,11 @@ static int mac_stricmp(const UINT8 *s1, const UINT8 *s2)
};
size_t common_len;
- int i;
int c1, c2;
common_len = (s1[0] <= s2[0]) ? s1[0] : s2[0];
- for (i=0; i<common_len; i++)
+ for (size_t i=0; i<common_len; i++)
{
c1 = mac_char_sort_table[s1[i+1]];
c2 = mac_char_sort_table[s2[i+1]];
@@ -1922,7 +1921,7 @@ static imgtoolerr_t mfs_dir_insert(struct mac_l2_imgref *l2_img, mfs_dirref *dir
dirref->index++;
}
- if (new_dir_entry_len <= (/*512*/510 - dirref->cur_offset))
+ if (new_dir_entry_len <= (size_t)(/*512*/510 - dirref->cur_offset))
{
/*memcpy(cur_dir_entry, new_dir_entry, new_dir_entry_len);*/
cur_dir_entry->flags = 0x80;
@@ -3177,7 +3176,7 @@ static imgtoolerr_t hfs_get_cat_record_data(struct mac_l2_imgref *l2_img, void *
lrec_key = (hfs_catKey*)rec_raw;
/* check that key is long enough to hold it all */
- if ((lrec_key->keyLen+1) < (offsetof(hfs_catKey, cName) + lrec_key->cName[0] + 1))
+ if ((size_t)(lrec_key->keyLen+1) < (offsetof(hfs_catKey, cName) + lrec_key->cName[0] + 1))
return IMGTOOLERR_CORRUPTIMAGE;
/* get pointer to record data */
diff --git a/src/mess/tools/imgtool/modules/psion.c b/src/mess/tools/imgtool/modules/psion.c
index 7b6e764efdd..da434c31abb 100644
--- a/src/mess/tools/imgtool/modules/psion.c
+++ b/src/mess/tools/imgtool/modules/psion.c
@@ -197,13 +197,13 @@ UINT8 get_free_file_id(psion_pack *pack)
void put_name_record(imgtool_stream *stream, const char* filename, UINT8 record_type, UINT8 record_id)
{
char data[0x10];
- int i = 0;
+ size_t i = 0;
data[i++] = 0x09;
data[i++] = record_type;
// filename is 8 char long space filled
- for (int j=0; j<8; j++)
+ for (size_t j=0; j<8; j++)
if (j < strlen(filename))
data[i++] = filename[j];
else
@@ -314,7 +314,7 @@ UINT16 put_opl(imgtool_stream *instream, imgtool_stream *outstream)
while ((line = stream_getline(instream, 256)))
{
// replace tab with space
- for (int i=0; i<strlen(line); i++)
+ for (size_t i=0; i<strlen(line); i++)
if (line[i] == '\t') line[i] = ' ';
stream_write(outstream, line, strlen(line));
diff --git a/src/mess/tools/imgtool/modules/vzdos.c b/src/mess/tools/imgtool/modules/vzdos.c
index ae9c259c90d..c9293a10f38 100644
--- a/src/mess/tools/imgtool/modules/vzdos.c
+++ b/src/mess/tools/imgtool/modules/vzdos.c
@@ -232,7 +232,8 @@ static imgtoolerr_t vzdos_clear_dirent(imgtool_image *img, int index)
/* search the index for a directory entry */
static imgtoolerr_t vzdos_searchentry(imgtool_image *image, const char *fname, int *entry) {
- int i, len, ret;
+ int i, ret;
+ size_t len;
vzdos_dirent ent;
char filename[9];
diff --git a/src/osd/windows/drawgdi.c b/src/osd/windows/drawgdi.c
index 2b7eae3b5e2..4da20757d05 100644
--- a/src/osd/windows/drawgdi.c
+++ b/src/osd/windows/drawgdi.c
@@ -170,7 +170,7 @@ static int drawgdi_window_draw(win_window_info *window, HDC dc, int update)
pitch = (width + 3) & ~3;
// make sure our temporary bitmap is big enough
- if (pitch * height * 4 > gdi->bmsize)
+ if ((size_t)(pitch * height * 4) > gdi->bmsize)
{
gdi->bmsize = pitch * height * 4 * 2;
global_free_array(gdi->bmdata);
diff --git a/src/osd/windows/winfile.c b/src/osd/windows/winfile.c
index 1d4c3afb23b..f262b4d9e99 100644
--- a/src/osd/windows/winfile.c
+++ b/src/osd/windows/winfile.c
@@ -383,7 +383,7 @@ int osd_uchar_from_osdchar(UINT32 *uchar, const char *osdchar, size_t count)
{
WCHAR wch;
- count = MIN(count, IsDBCSLeadByte(*osdchar) ? 2 : 1);
+ count = MIN(count, (size_t)(IsDBCSLeadByte(*osdchar) ? 2 : 1));
if (MultiByteToWideChar(CP_ACP, 0, osdchar, (DWORD)count, &wch, 1) != 0)
*uchar = wch;
else
diff --git a/src/tools/src2html.c b/src/tools/src2html.c
index dbbc3512c9e..329ae126ccd 100644
--- a/src/tools/src2html.c
+++ b/src/tools/src2html.c
@@ -598,7 +598,7 @@ static int output_file(file_type type, int srcrootlen, int dstrootlen, astring &
{
const token_entry *curtoken;
char *temp = srcptr;
- int toklength;
+ size_t toklength;
// find the end of the token
while (*temp != 0 && is_token[(UINT8)*temp])