From 79f7d4fd50a72f2cf51d47bd39e542217dc99050 Mon Sep 17 00:00:00 2001 From: Frode Solheim Date: Tue, 29 Jul 2014 23:12:30 +0200 Subject: [PATCH] bsdsocket: minor fixes (mostly format specifiers) --- bsdsocket.cpp | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/bsdsocket.cpp b/bsdsocket.cpp index 773f5da1..a86c3e49 100644 --- a/bsdsocket.cpp +++ b/bsdsocket.cpp @@ -372,7 +372,7 @@ static struct socketbase *alloc_socketbase (TrapContext *context) sb->signal = CallLib (context, sb->sysbase, -0x14A); /* AllocSignal */ if (sb->signal == -1) { - write_log (_T("bsdsocket: ERROR: Couldn't allocate signal for task 0x%lx.\n"), sb->ownertask); + write_log (_T("bsdsocket: ERROR: Couldn't allocate signal for task 0x%08x.\n"), sb->ownertask); free (sb); return NULL; } @@ -675,7 +675,7 @@ static uae_u32 REGPARAM2 bsdsocklib_SetSocketSignals (TrapContext *context) { struct socketbase *sb = get_socketbase (context); - BSDTRACE ((_T("SetSocketSignals(0x%08lx,0x%08lx,0x%08lx) -> "), m68k_dreg (regs, 0), m68k_dreg (regs, 1), m68k_dreg (regs, 2))); + BSDTRACE ((_T("SetSocketSignals(0x%08x,0x%08x,0x%08x) -> "), m68k_dreg (regs, 0), m68k_dreg (regs, 1), m68k_dreg (regs, 2))); sb->eintrsigs = m68k_dreg (regs, 0); sb->eventsigs = m68k_dreg (regs, 1); @@ -741,7 +741,7 @@ static uae_u32 REGPARAM2 bsdsocklib_ObtainSocket (TrapContext *context) { struct socketbase *sb = get_socketbase (context); int sd; - long id; + int id; SOCKET_TYPE s; int i; @@ -776,7 +776,7 @@ static uae_u32 REGPARAM2 bsdsocklib_ReleaseSocket (TrapContext *context) { struct socketbase *sb = get_socketbase (context); int sd; - long id; + int id; SOCKET_TYPE s; int i; uae_u32 flags; @@ -839,7 +839,7 @@ static uae_u32 REGPARAM2 bsdsocklib_ReleaseCopyOfSocket (TrapContext *context) { struct socketbase *sb = get_socketbase (context); int sd; - long id; + int id; SOCKET_TYPE s; int i; uae_u32 flags; @@ -910,7 +910,7 @@ static uae_u32 REGPARAM2 bsdsocklib_SetErrnoPtr (TrapContext *context) struct socketbase *sb = get_socketbase (context); uae_u32 errnoptr = m68k_areg (regs, 0), size = m68k_dreg (regs, 0); - BSDTRACE ((_T("SetErrnoPtr(0x%lx,%d) -> "), errnoptr, size)); + BSDTRACE ((_T("SetErrnoPtr(0x%08x,%d) -> "), errnoptr, size)); if (size == 1 || size == 2 || size == 4) { sb->errnoptr = errnoptr; @@ -1224,7 +1224,7 @@ static uae_u32 sana2wiretextptrs[sizeof (sana2wire_errlist) / sizeof (*sana2wire static const uae_u32 number_sana2wire_error = sizeof (sana2wire_errlist) / sizeof (*sana2wire_errlist); -static const TCHAR *io_errlist[] = +static const TCHAR *io_errlist[] = { _T("Unknown error"), /* 0 */ _T("Device or unit failed to open"), /* IOERR_OPENFAIL */ @@ -1337,7 +1337,7 @@ static uae_u32 REGPARAM2 bsdsocklib_SocketBaseTagList (TrapContext *context) BSDTRACE ((_T("TAG_IGNORE"))); break; case TAG_MORE: - BSDTRACE ((_T("TAG_MORE(0x%lx)"), currval)); + BSDTRACE ((_T("TAG_MORE(0x%x)"), currval)); tagptr = currval; break; case TAG_SKIP: @@ -1382,7 +1382,7 @@ static uae_u32 REGPARAM2 bsdsocklib_SocketBaseTagList (TrapContext *context) tagcopy (currtag, currval, tagptr, (uae_u32*)&sb->sb_herrno); break; case SBTC_DTABLESIZE: - BSDTRACE ((_T("SBTC_DTABLESIZE),0x%lx"), currval)); + BSDTRACE ((_T("SBTC_DTABLESIZE),0x%x"), currval)); if (currtag & 1) { bsdsocklib_SetDTableSize(sb, currval); } else { @@ -1426,7 +1426,7 @@ static uae_u32 REGPARAM2 bsdsocklib_SocketBaseTagList (TrapContext *context) } else { /* SBTM_GETVAL */ ulTmp = currval; } - BSDTRACE ((_T("IOERRNOSTRPTR),%d"), ulTmp)); + BSDTRACE ((_T("IOERRNOSTRPTR),%lu"), ulTmp)); if (ulTmp < number_sys_error) { tagcopy (currtag, currval, tagptr, &iotextptrs[ulTmp]); } else { @@ -1445,7 +1445,7 @@ static uae_u32 REGPARAM2 bsdsocklib_SocketBaseTagList (TrapContext *context) } else { /* SBTM_GETVAL */ ulTmp = currval; } - BSDTRACE ((_T("S2ERRNOSTRPTR),%d"), ulTmp)); + BSDTRACE ((_T("S2ERRNOSTRPTR),%lu"), ulTmp)); if (ulTmp < number_sys_error) { tagcopy (currtag, currval, tagptr, &sana2iotextptrs[ulTmp]); } else { @@ -1464,7 +1464,7 @@ static uae_u32 REGPARAM2 bsdsocklib_SocketBaseTagList (TrapContext *context) } else { /* SBTM_GETVAL */ ulTmp = currval; } - BSDTRACE ((_T("S2WERRNOSTRPTR),%d"), ulTmp)); + BSDTRACE ((_T("S2WERRNOSTRPTR),%lu"), ulTmp)); if (ulTmp < number_sys_error) { tagcopy (currtag, currval, tagptr, &sana2wiretextptrs[ulTmp]); } else { @@ -1483,7 +1483,7 @@ static uae_u32 REGPARAM2 bsdsocklib_SocketBaseTagList (TrapContext *context) } else { /* SBTM_GETVAL */ ulTmp = currval; } - BSDTRACE ((_T("ERRNOSTRPTR),%d"), ulTmp)); + BSDTRACE ((_T("ERRNOSTRPTR),%lu"), ulTmp)); if (ulTmp < number_sys_error) { tagcopy (currtag, currval, tagptr, &errnotextptrs[ulTmp]); } else { @@ -1502,7 +1502,7 @@ static uae_u32 REGPARAM2 bsdsocklib_SocketBaseTagList (TrapContext *context) } else { /* SBTM_GETVAL */ ulTmp = currval; } - BSDTRACE ((_T("HERRNOSTRPTR),%d"), ulTmp)); + BSDTRACE ((_T("HERRNOSTRPTR),%lu"), ulTmp)); if (ulTmp < number_host_error) { tagcopy (currtag, currval, tagptr, &herrnotextptrs[ulTmp]); } else { @@ -1512,22 +1512,22 @@ static uae_u32 REGPARAM2 bsdsocklib_SocketBaseTagList (TrapContext *context) break; case SBTC_ERRNOBYTEPTR: - BSDTRACE ((_T("SBTC_ERRNOBYTEPTR),0x%lx"), currval)); + BSDTRACE ((_T("SBTC_ERRNOBYTEPTR),0x%x"), currval)); tagcopy (currtag, currval, tagptr, &sb->errnoptr); sb->errnosize = 1; break; case SBTC_ERRNOWORDPTR: - BSDTRACE ((_T("SBTC_ERRNOWORDPTR),0x%lx"), currval)); + BSDTRACE ((_T("SBTC_ERRNOWORDPTR),0x%x"), currval)); tagcopy (currtag, currval, tagptr, &sb->errnoptr); sb->errnosize = 2; break; case SBTC_ERRNOLONGPTR: - BSDTRACE ((_T("SBTC_ERRNOLONGPTR),0x%lx"), currval)); + BSDTRACE ((_T("SBTC_ERRNOLONGPTR),0x%x"), currval)); tagcopy (currtag, currval, tagptr, &sb->errnoptr); sb->errnosize = 4; break; case SBTC_HERRNOLONGPTR: - BSDTRACE ((_T("SBTC_HERRNOLONGPTR),0x%lx"), currval)); + BSDTRACE ((_T("SBTC_HERRNOLONGPTR),0x%x"), currval)); tagcopy (currtag, currval, tagptr, &sb->herrnoptr); sb->herrnosize = 4; break; @@ -1670,7 +1670,7 @@ void bsdlib_reset (void) for (sb = socketbases; sb; sb = nsb) { nsb = sb->next; - write_log (_T("BSDSOCK: cleanup start socket %x\n"), sb); + write_log (_T("BSDSOCK: cleanup start socket %p\n"), sb); host_sbcleanup (sb); free (sb->dtable); -- 2.47.3