Re: Remove code which has been #if 0-ed for 11 years from DOSCONF_Device and DOSCONF_Install. (RESEND)
25 May
2010
25 May
'10
9:24 a.m.
Gerald Pfeifer <gerald(a)pfeifer.com> writes:
An alternate patch would be putting #if 0 around the
first occurrence
of loadhigh, too, but this code has been marked dead for more than 11
years, so I really think it can / should go?
It doesn't make sense to parse and not do anything with it. If you want
to remove dead code you can remove essentially the entire file.
--
Alexandre Julliard
julliard(a)winehq.org
19 Sep
19 Sep
1:21 p.m.
New subject: krnl386.exe16: Remove stubs for DOSCONF_Device and DOSCONF_Install.DOSCONF_Device and DOSCONF_Install. (RESEND)
On Tue, 25 May 2010, Alexandre Julliard wrote:
I did not feel that brave ;-), but indeed, how about removing those
function skeletons after 11 years as per the patch below?
Gerald
---
dlls/krnl386.exe16/dosconf.c | 45 ++++++-----------------------------------
1 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/dlls/krnl386.exe16/dosconf.c b/dlls/krnl386.exe16/dosconf.c
index a1500b7..cdbe5a1 100644
--- a/dlls/krnl386.exe16/dosconf.c
+++ b/dlls/krnl386.exe16/dosconf.c
@@ -41,12 +41,10 @@
WINE_DEFAULT_DEBUG_CHANNEL(profile);
-static int DOSCONF_Device(char **confline);
static int DOSCONF_Dos(char **confline);
static int DOSCONF_Fcbs(char **confline);
static int DOSCONF_Break(char **confline);
static int DOSCONF_Files(char **confline);
-static int DOSCONF_Install(char **confline);
static int DOSCONF_Lastdrive(char **confline);
static int DOSCONF_Menu(char **confline);
static int DOSCONF_Include(char **confline);
@@ -58,6 +56,11 @@ static int DOSCONF_Stacks(char **confline);
static int DOSCONF_Buffers(char **confline);
static void DOSCONF_Parse(char *menuname);
+static int DOSCONF_dummy(char **confline)
+{
+ return 1;
+}
+
static DOSCONF DOSCONF_config =
{
'E', /* lastdrive */
@@ -92,12 +95,12 @@ static const TAG_ENTRY DOSCONF_tag_entries[] =
{
{ ";", NULL },
{ "REM ", NULL },
- { "DEVICE", DOSCONF_Device },
+ { "DEVICE", DOSCONF_dummy },
{ "[", DOSCONF_Menu },
{ "SUBMENU", NULL },
{ "MENUDEFAULT", DOSCONF_Menu },
{ "INCLUDE", DOSCONF_Include },
- { "INSTALL", DOSCONF_Install },
+ { "INSTALL", DOSCONF_dummy },
{ "DOS", DOSCONF_Dos },
{ "FCBS", DOSCONF_Fcbs },
{ "BREAK", DOSCONF_Break },
@@ -143,25 +146,6 @@ static int DOSCONF_JumpToEntry(char **pconfline, char separator)
return 1;
}
-static int DOSCONF_Device(char **confline)
-{
- int loadhigh = 0;
-
- *confline += 6; /* strlen("DEVICE") */
- if (!(strncasecmp(*confline, "HIGH", 4)))
- {
- loadhigh = 1;
- *confline += 4;
- /* FIXME: get DEVICEHIGH parameters if avail ? */
- }
- if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
- TRACE("Loading device '%s'\n", *confline);
-#if 0
- DOSMOD_LoadDevice(*confline, loadhigh);
-#endif
- return 1;
-}
-
static int DOSCONF_Dos(char **confline)
{
*confline += 3; /* strlen("DOS") */
@@ -234,21 +218,6 @@ static int DOSCONF_Files(char **confline)
return 1;
}
-static int DOSCONF_Install(char **confline)
-{
-#if 0
- int loadhigh = 0;
-#endif
-
- *confline += 7; /* strlen("INSTALL") */
- if (!(DOSCONF_JumpToEntry(confline, '='))) return 0;
- TRACE( "Installing '%s'\n", *confline );
-#if 0
- DOSMOD_Install(*confline, loadhigh);
-#endif
- return 1;
-}
-
static int DOSCONF_Lastdrive(char **confline)
{
*confline += 9; /* strlen("LASTDRIVE") */
--
1.7.2.2
An alternate
patch would be putting #if 0 around the first occurrence
of loadhigh, too, but this code has been marked dead for more than 11
years, so I really think it can / should go?
It doesn't make sense to parse
and not do anything with it. If you want
to remove dead code you can remove essentially the entire file.
4993
days inactive
5110
days old
1 comments
2 participants
participants (2)
-
Alexandre Julliard -
Gerald Pfeifer