July 2013 - Wine-Commits - list.winehq.org

Francois Gouget : setupapi/tests: Remove a pointless use of assert().
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: ce64b90c97a53c3cb5ee2249a7eef2a66ccbc25d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce64b90c97a53c3cb5ee2249a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:14:14 2013 +0200 setupapi/tests: Remove a pointless use of assert(). --- dlls/setupapi/tests/parser.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/parser.c b/dlls/setupapi/tests/parser.c index 53f7cc0..5a99423 100644 --- a/dlls/setupapi/tests/parser.c +++ b/dlls/setupapi/tests/parser.c @@ -18,7 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -424,7 +423,12 @@ static void test_key_names(void) if (hinf == INVALID_HANDLE_VALUE) continue; ret = SetupFindFirstLineA( hinf, "Test", 0, &context ); - assert( ret ); + ok(ret, "SetupFindFirstLineA failed: le=%u\n", GetLastError()); + if (!ret) + { + SetupCloseInfFile( hinf ); + continue; + } check_key( &context, key_names[i].key );

1 0

Francois Gouget : comctl32/tests: Use ok(0) to report unexpected function calls instead of assert(0).
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: 47b56f238db4f14369c0cb68e689db81c72c38ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b56f238db4f14369c0cb68e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:09:07 2013 +0200 comctl32/tests: Use ok(0) to report unexpected function calls instead of assert(0). --- dlls/comctl32/tests/imagelist.c | 27 +++++++++++++-------------- 1 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 58a7e70..3e7adbc 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -26,7 +26,6 @@ #include <stdarg.h> #include <stdio.h> -#include <assert.h> #include "windef.h" #include "winbase.h" @@ -651,26 +650,26 @@ static struct my_IStream *impl_from_IStream(IStream *iface) static HRESULT STDMETHODCALLTYPE Test_Stream_QueryInterface(IStream *iface, REFIID riid, void **ppvObject) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static ULONG STDMETHODCALLTYPE Test_Stream_AddRef(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return 2; } static ULONG STDMETHODCALLTYPE Test_Stream_Release(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return 1; } static HRESULT STDMETHODCALLTYPE Test_Stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -703,13 +702,13 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_Write(IStream *iface, const void *p static HRESULT STDMETHODCALLTYPE Test_Stream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *plibNewPosition) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -717,46 +716,46 @@ static HRESULT STDMETHODCALLTYPE Test_Stream_CopyTo(IStream *iface, IStream *pst ULARGE_INTEGER cb, ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *pcbWritten) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Commit(IStream *iface, DWORD grfCommitFlags) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Revert(IStream *iface) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT STDMETHODCALLTYPE Test_Stream_Clone(IStream *iface, IStream **ppstm) { - assert(0); + ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

André Hentschel : msvcrt: Remove superfluous casts.
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: e931b5d17ee481798a72de2bd3103ed2d7afb131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e931b5d17ee481798a72de2bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 2 20:59:04 2013 +0200 msvcrt: Remove superfluous casts. --- dlls/msvcrt/cpp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 0fbdf5f..a3ee6b9 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -87,7 +87,7 @@ static void dump_obj_locator( const rtti_object_locator *ptr ) static void dump_obj_locator( const rtti_object_locator *ptr ) { int i; - char *base = ptr->signature == 0 ? (char*)RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; + char *base = ptr->signature == 0 ? RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; const rtti_object_hierarchy *h = (const rtti_object_hierarchy*)(base + ptr->type_hierarchy); const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); @@ -864,7 +864,7 @@ const type_info* CDECL MSVCRT___RTtypeid(void *cppobj) char *base; if(obj_locator->signature == 0) - base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); + base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator; @@ -992,7 +992,7 @@ void* CDECL MSVCRT___RTDynamicCast(void *cppobj, int unknown, if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); if(obj_locator->signature == 0) - base = (char*)RtlPcToFileHeader((void*)obj_locator, (void**)&base); + base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); else base = (char*)obj_locator - obj_locator->object_locator;

1 0

Marcus Meissner : oleaut32/tests: Test return of SafeArrayAllocData ( Coverity).
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: 9a0b4345ec1896c2ab7945ea3a96f85534e29e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a0b4345ec1896c2ab7945ea3… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jul 2 17:08:55 2013 +0200 oleaut32/tests: Test return of SafeArrayAllocData (Coverity). --- dlls/oleaut32/tests/safearray.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 289640b..469bdef 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -324,7 +324,8 @@ static void test_safearray(void) a->rgsabound[1].cElements = 4; a->rgsabound[1].lLbound = 1; a->cbElements = 2; - SafeArrayAllocData(a); + hres = SafeArrayAllocData(a); + ok(hres == S_OK, "SafeArrayAllocData failed with hres %x\n", hres); indices[0] = 4; indices[1] = 2;

1 0

Marcus Meissner : oleaut32: Check a return value (Coverity).
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: 0f86ae37c63ac9d55fe068d85440b121d03df432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f86ae37c63ac9d55fe068d85… Author: Marcus Meissner <meissner(a)suse.de> Date: Tue Jul 2 15:45:04 2013 +0200 oleaut32: Check a return value (Coverity). --- dlls/oleaut32/usrmarshal.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 495c257..0b541e4 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -1070,15 +1070,16 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B Buffer += sizeof(wiresab[0]) * wiresa->cDims; if(vt) + { *ppsa = SafeArrayCreateEx(vt, wiresa->cDims, wiresab, NULL); + if (!*ppsa) RpcRaiseException(E_OUTOFMEMORY); + } else { - SafeArrayAllocDescriptor(wiresa->cDims, ppsa); - if(*ppsa) - memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims); + if (FAILED(SafeArrayAllocDescriptor(wiresa->cDims, ppsa))) + RpcRaiseException(E_OUTOFMEMORY); + memcpy((*ppsa)->rgsabound, wiresab, sizeof(SAFEARRAYBOUND) * wiresa->cDims); } - if (!*ppsa) - RpcRaiseException(E_OUTOFMEMORY); /* be careful about which flags we set since they could be a security * risk */

1 0

Akihiro Sagawa : po: Use English shell path names in Japanese locale.
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: 2633b3bc894de49786d2f08c4fcb0603763b2f20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2633b3bc894de49786d2f08c4… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Jul 4 00:27:18 2013 +0900 po: Use English shell path names in Japanese locale. --- po/ja.po | 63 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/po/ja.po b/po/ja.po index 1373b97..9ff9cb8 100644 --- a/po/ja.po +++ b/po/ja.po @@ -5,15 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2013-07-02 23:19+0900\n" -"Last-Translator: Akira Nakagawa <matyapiro31(a)yahoo.co.jp>\n" +"PO-Revision-Date: 2013-07-03 23:54+0900\n" +"Last-Translator: Akihiro Sagawa <sagawa.aki(a)gmail.com>\n" "Language-Team: 日本語 <>\n" "Language: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 1.5.4\n" #: appwiz.rc:55 msgid "Install/Uninstall" @@ -7912,48 +7911,48 @@ msgstr "プログラム" #: shell32.rc:201 msgid "My Documents" -msgstr "マイドキュメント" +msgstr "My Documents" #: shell32.rc:202 msgid "Favorites" -msgstr "お気に入り" +msgstr "Favorites" #: shell32.rc:203 msgid "StartUp" -msgstr "スタートアップ" +msgstr "StartUp" #: shell32.rc:204 msgid "Start Menu" -msgstr "スタートメニュー" +msgstr "Start Menu" #: shell32.rc:205 msgid "My Music" -msgstr "マイミュージック" +msgstr "My Music" #: shell32.rc:206 msgid "My Videos" -msgstr "マイビデオ" +msgstr "My Videos" #: shell32.rc:207 msgctxt "directory" msgid "Desktop" -msgstr "デスクトップ" +msgstr "Desktop" #: shell32.rc:208 msgid "NetHood" -msgstr "ネットワーク内" +msgstr "NetHood" #: shell32.rc:209 msgid "Templates" -msgstr "テンプレート" +msgstr "Templates" #: shell32.rc:210 msgid "PrintHood" -msgstr "プリンタ内" +msgstr "PrintHood" #: shell32.rc:211 winhlp32.rc:45 msgid "History" -msgstr "ヒストリ" +msgstr "History" #: shell32.rc:212 msgid "Program Files" @@ -7961,7 +7960,7 @@ msgstr "Program Files" #: shell32.rc:214 msgid "My Pictures" -msgstr "マイピクチャ" +msgstr "My Pictures" #: shell32.rc:215 msgid "Common Files" @@ -7969,23 +7968,23 @@ msgstr "Common Files" #: shell32.rc:216 shell32.rc:147 shell32.rc:232 msgid "Documents" -msgstr "ドキュメント" +msgstr "Documents" #: shell32.rc:217 msgid "Administrative Tools" -msgstr "管理者用ツール" +msgstr "Administrative Tools" #: shell32.rc:218 msgid "Music" -msgstr "ミュージック" +msgstr "Music" #: shell32.rc:219 msgid "Pictures" -msgstr "ピクチャ" +msgstr "Pictures" #: shell32.rc:220 msgid "Videos" -msgstr "ビデオ" +msgstr "Videos" #: shell32.rc:213 msgid "Program Files (x86)" @@ -7993,19 +7992,19 @@ msgstr "Program Files (x86)" #: shell32.rc:221 msgid "Contacts" -msgstr "連絡先" +msgstr "Contacs" #: shell32.rc:222 winefile.rc:110 msgid "Links" -msgstr "リンク" +msgstr "Links" #: shell32.rc:223 msgid "Slide Shows" -msgstr "スライドショー" +msgstr "Slide Shows" #: shell32.rc:224 msgid "Playlists" -msgstr "プレイリスト" +msgstr "Playlists" #: shell32.rc:148 taskmgr.rc:326 msgid "Status" @@ -8021,35 +8020,35 @@ msgstr "機種名" #: shell32.rc:225 msgid "Sample Music" -msgstr "サンプルミュージック" +msgstr "Sample Music" #: shell32.rc:226 msgid "Sample Pictures" -msgstr "サンプルピクチャ" +msgstr "Sample Pictures" #: shell32.rc:227 msgid "Sample Playlists" -msgstr "サンプルプレイリスト" +msgstr "Sample Playlists" #: shell32.rc:228 msgid "Sample Videos" -msgstr "サンプルビデオ" +msgstr "Sample Videos" #: shell32.rc:229 msgid "Saved Games" -msgstr "保存済みのゲーム" +msgstr "Saved Games" #: shell32.rc:230 msgid "Searches" -msgstr "検索" +msgstr "Searches" #: shell32.rc:231 msgid "Users" -msgstr "ユーザー" +msgstr "Users" #: shell32.rc:233 msgid "Downloads" -msgstr "ダウンロード" +msgstr "Downloads" #: shell32.rc:166 msgid "Unable to create new Folder: Permission denied."

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard July 3, 2013

July 3, 2013

Module: wine Branch: master Commit: 653354ab254e70eb846aa920ff43de75bb30773d URL: http://source.winehq.org/git/wine.git/?a=commit;h=653354ab254e70eb846aa920f… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 3 12:11:13 2013 +0200 Assorted spelling fixes. --- dlls/shell32/iconcache.c | 6 +++--- dlls/shell32/tests/shelllink.c | 6 ++++-- dlls/user32/tests/edit.c | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/iconcache.c b/dlls/shell32/iconcache.c index 91f0eb5..e2300f1 100644 --- a/dlls/shell32/iconcache.c +++ b/dlls/shell32/iconcache.c @@ -880,11 +880,11 @@ INT WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, INT iIconIndex) /**************************************************************************** * SHGetStockIconInfo [SHELL32.@] * - * Receive informations for builtin icons + * Receive information for builtin icons * * PARAMS - * id [I] selected icon-id to get informations - * flags [I] select informations to receive + * id [I] selected icon-id to get information for + * flags [I] selects the information to receive * sii [IO] SHSTOCKICONINFO structure to fill * * RETURNS diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index a3301d8..7dc4379 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1042,8 +1042,10 @@ static void test_SHGetStockIconInfo(void) if (atleast_win7 && (i == (SIID_MAX_ICONS - 1)) && broken(hr == E_INVALIDARG)) { - /* off by one windows bug: there are SIID_MAX_ICONS icons from 0 upto - SIID_MAX_ICONS-1 on win8, but the last one is missing on win7 */ + /* Off by one windows bug: there are SIID_MAX_ICONS icons from 0 + * up to SIID_MAX_ICONS-1 on Windows 8, but the last one is missing + * on Windows 7. + */ trace("%3d: got E_INVALIDARG (windows bug: off by one)\n", i); } else if (atleast_win7 && (i < (SIID_MAX_ICONS))) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 700dfb0..fb4a8b3 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2628,7 +2628,7 @@ static void test_EM_GETHANDLE(void) len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); ok((r == 1) && (len == lstrlenA(str1)), "got %d and %d (expected 1 and %d)\n", r, len, lstrlenA(str1)); - /* everything is normal upto EM_GETHANDLE */ + /* everything is normal up to EM_GETHANDLE */ hmem = (HGLOBAL) SendMessage(hEdit, EM_GETHANDLE, 0, 0); /* Some messages still work while other messages fail. After LocalFree the memory handle, messages can crash the app */

1 0

Ken Thomases : winemac: Force swap interval to 0 for single-buffered contexts to avoid vsync' ed flushes.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: 967a49fcb24493dafe9c39ffa49eee3f2bea87e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=967a49fcb24493dafe9c39ffa… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jul 2 01:25:00 2013 -0500 winemac: Force swap interval to 0 for single-buffered contexts to avoid vsync'ed flushes. --- dlls/winemac.drv/opengl.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index 904158b..69f94e2 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -2901,7 +2901,9 @@ static BOOL macdrv_wglSwapIntervalEXT(int interval) return FALSE; } - if (interval > 1) + if (!pixel_formats[context->format - 1].double_buffer) + interval = 0; + else if (interval > 1) interval = 1; value = interval; @@ -3238,8 +3240,14 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share) } /* According to the WGL_EXT_swap_control docs, the default swap interval for - a context is 1. CGL contexts default to 0, so we need to set it. */ - swap_interval = 1; + a context is 1. CGL contexts default to 0, so we need to set it. This + only make sense for double-buffered contexts, though. In theory, for + single-buffered contexts, there's no such thing as a swap. But OS X + will synchronize flushes of single-buffered contexts if this is set. */ + if (pf->double_buffer) + swap_interval = 1; + else + swap_interval = 0; err = CGLSetParameter(context->cglcontext, kCGLCPSwapInterval, (GLint*)&swap_interval); if (err != kCGLNoError) WARN("CGLSetParameter(kCGLCPSwapInterval) failed with error %d %s; leaving un-vsynced\n", err, CGLErrorString(err));

1 0

André Hentschel : dmusic: Remove superfluous cast.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: b75f5c728db89df35cf32c09207d529debef1d68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75f5c728db89df35cf32c092… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 1 22:55:10 2013 +0200 dmusic: Remove superfluous cast. --- dlls/dmusic/port.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 42fd5ea..2e60828 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -263,7 +263,7 @@ static HRESULT WINAPI SynthPortImpl_IDirectMusicPort_DownloadInstrument(LPDIRECT nb_regions = instrument_object->header.cRegions; size = sizeof(DMUS_DOWNLOADINFO) + sizeof(ULONG) * (1 + nb_regions) + sizeof(DMUS_INSTRUMENT) + sizeof(DMUS_REGION) * nb_regions; - data = (BYTE*)HeapAlloc(GetProcessHeap(), 0, size); + data = HeapAlloc(GetProcessHeap(), 0, size); if (!data) return E_OUTOFMEMORY;

1 0

André Hentschel : winedump: Remove superfluous casts.
by Alexandre Julliard July 2, 2013

July 2, 2013

Module: wine Branch: master Commit: 900594198a8b7ef38ab5cd36234fff4e942df2dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=900594198a8b7ef38ab5cd362… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jul 1 22:07:02 2013 +0200 winedump: Remove superfluous casts. --- tools/winedump/tlb.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/tlb.c b/tools/winedump/tlb.c index 9ca20b8..c487dde 100644 --- a/tools/winedump/tlb.c +++ b/tools/winedump/tlb.c @@ -82,19 +82,19 @@ static const void *tlb_read(int size) { static int tlb_read_int(void) { - const int *ret = (const int*)tlb_read(sizeof(int)); + const int *ret = tlb_read(sizeof(int)); return ret ? *ret : -1; } static int tlb_read_short(void) { - const short *ret = (const short*)tlb_read(sizeof(short)); + const short *ret = tlb_read(sizeof(short)); return ret ? *ret : -1; } static int tlb_read_byte(void) { - const unsigned char *ret = (const unsigned char*)tlb_read(sizeof(char)); + const unsigned char *ret = tlb_read(sizeof(char)); return ret ? *ret : -1; }

1 0