=?UTF-8?Q?Fr=C3=A9d=C3=A9ric=20Delanoy=20?=: cmd: Avoid unnecessary null pointer checks.
Alexandre Julliard
julliard at winehq.org
Mon Oct 31 12:49:06 CDT 2011
Module: wine
Branch: master
Commit: 41a94504408a3042e0c0a7b52e5b9a80eaf61d33
URL: http://source.winehq.org/git/wine.git/?a=commit;h=41a94504408a3042e0c0a7b52e5b9a80eaf61d33
Author: Frédéric Delanoy <frederic.delanoy at gmail.com>
Date: Sat Oct 29 01:08:49 2011 +0200
cmd: Avoid unnecessary null pointer checks.
---
programs/cmd/wcmdmain.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 56aa85f..40ed145 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -278,14 +278,12 @@ static void WCMD_output_asis_handle (DWORD std_handle, const WCHAR *message) {
ptr++;
};
if (*ptr == '\n') ptr++;
- WCMD_output_asis_len(message, (ptr) ? ptr - message : strlenW(message), handle);
- if (ptr) {
- numChars = 0;
- if (++line_count >= max_height - 1) {
- line_count = 0;
- WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle);
- WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count);
- }
+ WCMD_output_asis_len(message, ptr - message, handle);
+ numChars = 0;
+ if (++line_count >= max_height - 1) {
+ line_count = 0;
+ WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle);
+ WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count);
}
} while (((message = ptr) != NULL) && (*ptr));
} else {
More information about the wine-cvs
mailing list