=?UTF-8?Q?J=C3=B6rg=20H=C3=B6hle=20?=: mciseq: Remove superfluous NULL pointer check.
Alexandre Julliard
julliard at winehq.org
Fri Sep 14 10:54:22 CDT 2012
Module: wine
Branch: master
Commit: 5b3121b63265a34d36eabecca1ad0108f1be633a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b3121b63265a34d36eabecca1ad0108f1be633a
Author: Jörg Höhle <hoehle at users.sourceforge.net>
Date: Tue Jul 19 09:15:15 2011 +0200
mciseq: Remove superfluous NULL pointer check.
---
dlls/mciseq/mcimidi.c | 38 ++++++++++++++------------------------
1 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c
index 2783c07..e0d8164 100644
--- a/dlls/mciseq/mcimidi.c
+++ b/dlls/mciseq/mcimidi.c
@@ -231,8 +231,7 @@ static DWORD MIDI_mciReadByte(WINE_MCIMIDI* wmm, BYTE *lpbyt)
{
DWORD ret = 0;
- if (lpbyt == NULL ||
- mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) {
+ if (mmioRead(wmm->hFile, (HPSTR)lpbyt, sizeof(BYTE)) != (long)sizeof(BYTE)) {
WARN("Error reading wmm=%p\n", wmm);
ret = MCIERR_INVALID_FILE;
}
@@ -248,8 +247,7 @@ static DWORD MIDI_mciReadWord(WINE_MCIMIDI* wmm, LPWORD lpw)
BYTE hibyte, lobyte;
DWORD ret = MCIERR_INVALID_FILE;
- if (lpw != NULL &&
- MIDI_mciReadByte(wmm, &hibyte) == 0 &&
+ if (MIDI_mciReadByte(wmm, &hibyte) == 0 &&
MIDI_mciReadByte(wmm, &lobyte) == 0) {
*lpw = ((WORD)hibyte << 8) + lobyte;
ret = 0;
@@ -265,8 +263,7 @@ static DWORD MIDI_mciReadLong(WINE_MCIMIDI* wmm, LPDWORD lpdw)
WORD hiword, loword;
DWORD ret = MCIERR_INVALID_FILE;
- if (lpdw != NULL &&
- MIDI_mciReadWord(wmm, &hiword) == 0 &&
+ if (MIDI_mciReadWord(wmm, &hiword) == 0 &&
MIDI_mciReadWord(wmm, &loword) == 0) {
*lpdw = MAKELONG(loword, hiword);
ret = 0;
@@ -281,24 +278,17 @@ static WORD MIDI_mciReadVaryLen(WINE_MCIMIDI* wmm, LPDWORD lpdw)
{
BYTE byte;
DWORD value = 0;
- WORD ret = 0;
+ WORD len = 0;
- if (lpdw == NULL) {
- ret = MCIERR_INVALID_FILE;
- } else {
- do {
- if (MIDI_mciReadByte(wmm, &byte) != 0) {
- return 0;
- }
- value = (value << 7) + (byte & 0x7F);
- ret++;
- } while (byte & 0x80);
- *lpdw = value;
- /*
- TRACE("val=%08X\n", value);
- */
- }
- return ret;
+ do {
+ if (MIDI_mciReadByte(wmm, &byte) != 0) {
+ return 0;
+ }
+ value = (value << 7) + (byte & 0x7F);
+ len++;
+ } while (byte & 0x80);
+ *lpdw = value;
+ return len;
}
/**************************************************************************
More information about the wine-cvs
mailing list