claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fixes various warnings on clang 9.0

Browse Source
This commit is contained in:
driver1998
2019-03-20 02:42:55 +08:00
parent faafb78c6e
commit 27fc87f5e8
18 changed files with 63 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/config.c
View File

@@ -1911,7 +1911,7 @@ config_dump(void)
while (sec != NULL) { while (sec != NULL) {
entry_t *ent; entry_t *ent;
if (sec->name && sec->name[0]) if (sec->name[0])
config_log("[%s]\n", sec->name); config_log("[%s]\n", sec->name);
ent = (entry_t *)sec->entry_head.next; ent = (entry_t *)sec->entry_head.next;

4
src/floppy/fdd_86f.c
View File

@@ -1112,7 +1112,7 @@ d86f_get_bit(int drive, int side)
/* In some cases, misindentification occurs so we need to make sure the surface data array is not /* In some cases, misindentification occurs so we need to make sure the surface data array is not
not NULL. */ not NULL. */
if (d86f_has_surface_desc(drive) && dev->track_surface_data && dev->track_surface_data[side]) { if (d86f_has_surface_desc(drive) && dev->track_surface_data[side]) {
if (d86f_reverse_bytes(drive)) { if (d86f_reverse_bytes(drive)) {
surface_data = dev->track_surface_data[side][track_word] & 0xFF; surface_data = dev->track_surface_data[side][track_word] & 0xFF;
} else { } else {
@@ -1124,7 +1124,7 @@ d86f_get_bit(int drive, int side)
current_bit = (encoded_data >> track_bit) & 1; current_bit = (encoded_data >> track_bit) & 1;
dev->last_word[side] <<= 1; dev->last_word[side] <<= 1;
if (d86f_has_surface_desc(drive) && dev->track_surface_data && dev->track_surface_data[side]) { if (d86f_has_surface_desc(drive) && dev->track_surface_data[side]) {
surface_bit = (surface_data >> track_bit) & 1; surface_bit = (surface_data >> track_bit) & 1;
if (! surface_bit) if (! surface_bit)
dev->last_word[side] |= current_bit; dev->last_word[side] |= current_bit;

6
src/network/slirp/ip.h
View File

@@ -209,7 +209,7 @@ typedef u_int32_t caddr32_t;
#endif #endif
#endif #endif
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
typedef uintptr_t ipqp_32; typedef uintptr_t ipqp_32;
typedef uintptr_t ipasfragp_32; typedef uintptr_t ipasfragp_32;
#else #else
@@ -230,7 +230,7 @@ typedef caddr32_t ipasfragp_32;
#endif #endif
struct ipovly { struct ipovly {
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
uintptr_t ih_next, ih_prev; /* for protocol sequence q's */ uintptr_t ih_next, ih_prev; /* for protocol sequence q's */
#else #else
caddr32_t ih_next, ih_prev; /* for protocol sequence q's */ caddr32_t ih_next, ih_prev; /* for protocol sequence q's */
@@ -258,7 +258,7 @@ struct ipovly {
* size 28 bytes * size 28 bytes
*/ */
struct ipq { struct ipq {
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
uintptr_t next,prev; /* to other reass headers */ uintptr_t next,prev; /* to other reass headers */
#else #else
ipqp_32 next,prev; /* to other reass headers */ ipqp_32 next,prev; /* to other reass headers */

2
src/network/slirp/tcp.h
View File

@@ -33,7 +33,7 @@
#ifndef _TCP_H_ #ifndef _TCP_H_
#define _TCP_H_ #define _TCP_H_
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
typedef uintptr_t tcp_seq; typedef uintptr_t tcp_seq;
#else #else
typedef u_int32_t tcp_seq; typedef u_int32_t tcp_seq;

4
src/network/slirp/tcp_var.h
View File

@@ -36,7 +36,7 @@
#include "tcpip.h" #include "tcpip.h"
#include "tcp_timer.h" #include "tcp_timer.h"
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
typedef uintptr_t tcpiphdrp_32; typedef uintptr_t tcpiphdrp_32;
#else #else
#if SIZEOF_CHAR_P == 4 #if SIZEOF_CHAR_P == 4
@@ -178,7 +178,7 @@ struct tcpcb {
* port numbers (which are no longer needed once we've located the * port numbers (which are no longer needed once we've located the
* tcpcb) are overlayed with an mbuf pointer. * tcpcb) are overlayed with an mbuf pointer.
*/ */
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
typedef uintptr_t mbufp_32; typedef uintptr_t mbufp_32;
#else #else
#if SIZEOF_CHAR_P == 4 #if SIZEOF_CHAR_P == 4

2
src/printer/printer.h
View File

@@ -58,7 +58,7 @@
#define FONT_FILE_OCRB L"ocra.ttf" #define FONT_FILE_OCRB L"ocra.ttf"
extern const void extern void
select_codepage(uint16_t code, uint16_t *curmap); select_codepage(uint16_t code, uint16_t *curmap);

6
src/printer/prt_cpmap.c
View File

@@ -10,12 +10,12 @@
* *
* Version: @(#)prt_cpmap.c 1.0.2 2018/10/05 * Version: @(#)prt_cpmap.c 1.0.2 2018/10/05
* *
* Authors: Michael Dr<44>ing, <michael@drueing.de> * Authors: Michael Dr<44>ing, <michael@drueing.de>
* Fred N. van Kempen, <decwiz@yahoo.com> * Fred N. van Kempen, <decwiz@yahoo.com>
* *
* Based on code by Frederic Weymann (originally for DosBox.) * Based on code by Frederic Weymann (originally for DosBox.)
* *
* Copyright 2018 Michael Dr<44>ing. * Copyright 2018 Michael Dr<44>ing.
* Copyright 2018 Fred N. van Kempen. * Copyright 2018 Fred N. van Kempen.
* *
* Redistribution and use in source and binary forms, with * Redistribution and use in source and binary forms, with
@@ -572,7 +572,7 @@ static const struct {
/* Select a ASCII->Unicode mapping by CP number */ /* Select a ASCII->Unicode mapping by CP number */
const void void
select_codepage(uint16_t code, uint16_t *curmap) select_codepage(uint16_t code, uint16_t *curmap)
{ {
int i = 0; int i = 0;

2
src/scsi/scsi_ncr5380.c
View File

@@ -910,7 +910,7 @@ ncr_callback(void *priv)
ncr_log("Select - target ID = %i\n", ncr->target_id); ncr_log("Select - target ID = %i\n", ncr->target_id);
/*Once the device has been found and selected, mark it as busy*/ /*Once the device has been found and selected, mark it as busy*/
if ((ncr->target_id != -1) && scsi_device_present(&scsi_devices[ncr->target_id])) { if ((ncr->target_id != (uint8_t)-1) && scsi_device_present(&scsi_devices[ncr->target_id])) {
ncr->cur_bus |= BUS_BSY; ncr->cur_bus |= BUS_BSY;
ncr_log("Device found at ID %i\n", ncr->target_id); ncr_log("Device found at ID %i\n", ncr->target_id);
ncr_log("Current Bus BSY=%02x\n", ncr->cur_bus); ncr_log("Current Bus BSY=%02x\n", ncr->cur_bus);

2
src/scsi/scsi_ncr53c8xx.h
View File

@@ -21,7 +21,7 @@
* Copyright 2009-2018 Artyom Tarasenko. * Copyright 2009-2018 Artyom Tarasenko.
* Copyright 2017,2018 Miran Grca. * Copyright 2017,2018 Miran Grca.
*/ */
#ifndef SCSI_NCR5C38XX_H #ifndef SCSI_NCR53C8XX_H
# define SCSI_NCR53C8XX_H # define SCSI_NCR53C8XX_H

2
src/win/win_about.c
View File

@@ -31,7 +31,7 @@
#include "win.h" #include "win.h"
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK

2
src/win/win_devconf.c
View File

@@ -36,7 +36,7 @@ static device_context_t config_device;
static uint8_t deviceconfig_changed = 0; static uint8_t deviceconfig_changed = 0;
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK

2
src/win/win_jsconf.c
View File

@@ -150,7 +150,7 @@ static int get_pov(HWND hdlg, int id)
return axis_sel - nr_povs; return axis_sel - nr_povs;
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK

2
src/win/win_mouse.cpp
View File

@@ -20,7 +20,7 @@
#include <dinput.h> #include <dinput.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h> #include <stdint.h>
#include "../86Box.h" #include "../86box.h"
#include "../mouse.h" #include "../mouse.h"
#include "../plat.h" #include "../plat.h"
#include "win.h" #include "win.h"

2
src/win/win_new_floppy.c
View File

@@ -542,7 +542,7 @@ new_floppy_msgbox(HWND hwnd, int type, void *arg)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK

36
src/win/win_settings.c
View File

@@ -154,7 +154,7 @@ image_list_init(HWND hwndList, const uint8_t *icon_ids)
if (icon_ids[i] == 0) if (icon_ids[i] == 0)
break; break;
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
hiconItem = LoadIcon(hinstance, (LPCWSTR) ((uint64_t) icon_ids[i])); hiconItem = LoadIcon(hinstance, (LPCWSTR) ((uint64_t) icon_ids[i]));
#else #else
hiconItem = LoadIcon(hinstance, (LPCWSTR) ((uint32_t) icon_ids[i])); hiconItem = LoadIcon(hinstance, (LPCWSTR) ((uint32_t) icon_ids[i]));
@@ -644,7 +644,7 @@ win_settings_machine_recalc_machine(HWND hdlg)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
@@ -858,7 +858,7 @@ recalc_vid_list(HWND hdlg)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
@@ -977,7 +977,7 @@ mouse_valid(int num, int m)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
@@ -1128,7 +1128,7 @@ mpu401_standalone_allow(void)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
@@ -1335,7 +1335,7 @@ win_settings_sound_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
@@ -1453,7 +1453,7 @@ recalc_hdc_list(HWND hdlg)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
@@ -1785,7 +1785,7 @@ static void network_recalc_combos(HWND hdlg)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
@@ -2513,7 +2513,7 @@ recalc_selection(HWND hdlg)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
@@ -3211,14 +3211,14 @@ hard_disk_track_all(void)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
#endif #endif
win_settings_hard_disks_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) win_settings_hard_disks_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HWND h; HWND h = NULL;
int old_sel = 0, b = 0, assign = 0; int old_sel = 0, b = 0, assign = 0;
const uint8_t hd_icons[2] = { 64, 0 }; const uint8_t hd_icons[2] = { 64, 0 };
@@ -4044,14 +4044,14 @@ zip_untrack(uint8_t id)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
#endif #endif
win_settings_floppy_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) win_settings_floppy_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HWND h; HWND h = NULL;
int i = 0, old_sel = 0; int i = 0, old_sel = 0;
WCHAR szText[256]; WCHAR szText[256];
const uint8_t fd_icons[15] = { 248, 16, 16, 16, 16, 16, 16, 24, 24, 24, 24, 24, 24, 24, 0 }; const uint8_t fd_icons[15] = { 248, 16, 16, 16, 16, 16, 16, 24, 24, 24, 24, 24, 24, 24, 0 };
@@ -4150,14 +4150,14 @@ win_settings_floppy_drives_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM l
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
#endif #endif
win_settings_other_removable_devices_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) win_settings_other_removable_devices_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HWND h; HWND h = NULL;
int old_sel = 0, b = 0, assign = 0; int old_sel = 0, b = 0, assign = 0;
uint32_t b2 = 0; uint32_t b2 = 0;
const uint8_t cd_icons[3] = { 249, 32, 0 }; const uint8_t cd_icons[3] = { 249, 32, 0 };
@@ -4498,7 +4498,7 @@ win_settings_communicate_closure(void)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
@@ -4524,14 +4524,14 @@ win_settings_confirm(HWND hdlg, int button)
} }
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK
#endif #endif
win_settings_main_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam) win_settings_main_proc(HWND hdlg, UINT message, WPARAM wParam, LPARAM lParam)
{ {
HWND h; HWND h = NULL;
int category, i = 0, j = 0; int category, i = 0, j = 0;
const uint8_t cat_icons[11] = { 240, 241, 242, 243, 80, 244, 245, 64, 246, 247, 0 }; const uint8_t cat_icons[11] = { 240, 241, 242, 243, 80, 244, 245, 64, 246, 247, 0 };

2
src/win/win_snd_gain.c
View File

@@ -35,7 +35,7 @@
static uint8_t old_gain; static uint8_t old_gain;
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK

2
src/win/win_stbar.c
View File

@@ -796,7 +796,7 @@ ui_sb_mount_zip_img(uint8_t id, int part, uint8_t wp, wchar_t *file_name)
/* Handle messages for the Status Bar window. */ /* Handle messages for the Status Bar window. */
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK

6
src/win/win_ui.c
View File

@@ -349,7 +349,7 @@ MainWindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
/* Main Window. */ /* Main Window. */
MoveWindow(hwnd, rect.left, rect.top, MoveWindow(hwnd, rect.left, rect.top,
unscaled_size_x + (GetSystemMetrics(vid_resize ? SM_CXSIZEFRAME : SM_CXFIXEDFRAME) * 2), unscaled_size_x + (GetSystemMetrics(vid_resize ? SM_CXSIZEFRAME : SM_CXFIXEDFRAME) * 2),
unscaled_size_y + (GetSystemMetrics(SM_CYEDGE) * 2) + (GetSystemMetrics(vid_resize ? SM_CYSIZEFRAME : SM_CYFIXEDFRAME) * 2) + GetSystemMetrics(SM_CYMENUSIZE) + GetSystemMetrics(SM_CYCAPTION) + 17 + sb_borders[1] + 1, unscaled_size_y + (GetSystemMetrics(SM_CYEDGE) * 2) + (GetSystemMetrics(vid_resize ? SM_CYSIZEFRAME : SM_CYFIXEDFRAME) * 2) + GetSystemMetrics(SM_CYMENUSIZE) + GetSystemMetrics(SM_CYCAPTION) + 17 + sb_borders[1] + 1,
TRUE); TRUE);
/* Render window. */ /* Render window. */
@@ -726,7 +726,7 @@ ui_init(int nCmdShow)
WNDCLASSEX wincl; /* buffer for main window's class */ WNDCLASSEX wincl; /* buffer for main window's class */
RAWINPUTDEVICE ridev; /* RawInput device */ RAWINPUTDEVICE ridev; /* RawInput device */
MSG messages; /* received-messages buffer */ MSG messages; /* received-messages buffer */
HWND hwnd; /* handle for our window */ HWND hwnd = NULL; /* handle for our window */
HACCEL haccel; /* handle to accelerator table */ HACCEL haccel; /* handle to accelerator table */
int bRet; int bRet;
@@ -1060,7 +1060,7 @@ plat_mouse_capture(int on)
/* Catch WM_INPUT messages for 'current focus' window. */ /* Catch WM_INPUT messages for 'current focus' window. */
static LONG_PTR input_orig_proc; static LONG_PTR input_orig_proc;
static HWND input_orig_hwnd = NULL; static HWND input_orig_hwnd = NULL;
#ifdef __amd64__ #if defined(__amd64__) || defined(__aarch64__)
static LRESULT CALLBACK static LRESULT CALLBACK
#else #else
static BOOL CALLBACK static BOOL CALLBACK