[4/4] cmd: Get rid of unused parameter in WCMD_ReadFile

Frédéric Delanoy frederic.delanoy at gmail.com
Mon Sep 26 17:42:43 CDT 2011


LPOVERLAPPED "unused" parameter was always NULL
---
 programs/cmd/batch.c    |    2 +-
 programs/cmd/builtins.c |    8 ++++----
 programs/cmd/wcmd.h     |    3 +--
 programs/cmd/wcmdmain.c |    6 ++----
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c
index aef0fa0..f92ebc8 100644
--- a/programs/cmd/batch.c
+++ b/programs/cmd/batch.c
@@ -196,7 +196,7 @@ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, const BOOL is_console_handle)
   }
   /* TODO: More intelligent buffering for reading lines from files */
   do {
-    status = WCMD_ReadFile (h, s, 1, &bytes, NULL);
+    status = WCMD_ReadFile(h, s, 1, &bytes);
     if ((status == 0) || ((bytes == 0) && (s == p))) return NULL;
     if (*s == '\n') bytes = 0;
     else if (*s != '\r') {
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index 440ee38..ce72215 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -309,7 +309,7 @@ void WCMD_choice (const WCHAR * command) {
         if (have_console)
             ReadConsoleW(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count, NULL);
         else
-            WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count, NULL);
+            WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count);
 
         if (!opt_s)
             answer[0] = toupperW(answer[0]);
@@ -2477,7 +2477,7 @@ void WCMD_type (WCHAR *command) {
         static const WCHAR fmt[] = {'\n','%','s','\n','\n','\0'};
         WCMD_output(fmt, thisArg);
       }
-      while (WCMD_ReadFile (h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count, NULL)) {
+      while (WCMD_ReadFile(h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count)) {
         if (count == 0) break;	/* ReadFile reports success on EOF! */
         buffer[count] = 0;
         WCMD_output_asis (buffer);
@@ -2531,7 +2531,7 @@ void WCMD_more (WCHAR *command) {
     wsprintfW(moreStrPage, moreFmt, moreStr);
 
     WCMD_enter_paged_mode(moreStrPage);
-    while (WCMD_ReadFile (hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count, NULL)) {
+    while (WCMD_ReadFile(hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) {
       if (count == 0) break;	/* ReadFile reports success on EOF! */
       buffer[count] = 0;
       WCMD_output_asis (buffer);
@@ -2585,7 +2585,7 @@ void WCMD_more (WCHAR *command) {
         fileLen = (((ULONG64)fileInfo.nFileSizeHigh) << 32) + fileInfo.nFileSizeLow;
 
         needsPause = TRUE;
-        while (WCMD_ReadFile (h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count, NULL)) {
+        while (WCMD_ReadFile(h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) {
           if (count == 0) break;	/* ReadFile reports success on EOF! */
           buffer[count] = 0;
           curPos += count;
diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h
index 5133d20..98e1246 100644
--- a/programs/cmd/wcmd.h
+++ b/programs/cmd/wcmd.h
@@ -108,8 +108,7 @@ void WCMD_opt_s_strip_quotes(WCHAR *cmd);
 WCHAR *WCMD_LoadMessage(UINT id);
 WCHAR *WCMD_strdupW(const WCHAR *input);
 void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len);
-BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars,
-                   LPDWORD charsRead, const LPOVERLAPPED unused);
+BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead);
 
 WCHAR    *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output,
                                 HANDLE readFrom, const BOOL is_console_handle);
diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c
index 6e5ed16..4bcf25d 100644
--- a/programs/cmd/wcmdmain.c
+++ b/programs/cmd/wcmdmain.c
@@ -237,11 +237,9 @@ void WCMD_leave_paged_mode(void)
  * WCMD_Readfile
  *
  * Read characters in from a file, returning result in Unicode
- *      with signature identical to ReadFile
  */
-BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars,
-                          LPDWORD charsRead, const LPOVERLAPPED unused) {
-
+BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead)
+{
     DWORD numRead;
     char *buffer;
 
-- 
1.7.6.3




More information about the wine-patches mailing list