remove now-pointless if statement add a little more debug output Modified: trunk/reactos/subsys/system/cmd/choice.c _____
Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-09-20 19:51:27 UTC (rev 17951) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-09-20 20:13:16 UTC (rev 17952) @@ -239,29 +239,15 @@
while (TRUE) { ConInKey (&ir); - - if (bNoPrompt != FALSE) - { + val = IsKeyInString (lpOptions, #ifdef _UNICODE
ir.Event.KeyEvent.uChar.UnicodeChar, #else
ir.Event.KeyEvent.uChar.AsciiChar, -#endif +#endif bCaseSensitive); - } - else - {
- val = IsKeyInString (lpOptions, -#ifdef _UNICODE - ir.Event.KeyEvent.uChar.UnicodeChar, -#else - ir.Event.KeyEvent.uChar.AsciiChar, -#endif - bCaseSensitive); - } - if (val >= 0) { ConOutPrintf (_T("%c\n"), lpOptions[val]); @@ -275,6 +261,9 @@ }
freep (arg); +#ifdef _DEBUG + DebugPrintf (_T("ErrorLevel: %d\n"), nErrorLevel); +#endif /* _DEBUG */ return 0; }