ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR][KDCOM][KDGDB][NTOS:KD] Some code "nits"

Browse Source 
- Don't hardcode constant string lengths.

- Use `_strnicmp()` -- Ideally we shouldn't have to unconditionally upcase
  the global kernel command-line string to perform substrings comparisons.

- Cast `atol()` returned value to `ULONG`.
This commit is contained in:
Hermès Bélusca-Maïto
2026-03-19 22:49:29 +01:00
parent 4d0642b67f
commit c4d60756dd
4 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/base/kdcom/kdcom.c
+11 -14
View File
@@ -9,7 +9,6 @@
#include "kddll.h"
#include <arc/arc.h>
#include <stdio.h>
#include <stdlib.h>
#include <ndk/halfuncs.h>
@@ -125,6 +124,8 @@ NTSTATUS
NTAPI
KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
{
#define CONST_STR_LEN(x) (sizeof(x)/sizeof(x[0]) - 1)
ULONG ComPortNumber = DEFAULT_DEBUG_PORT;
ULONG ComPortBaudRate = DEFAULT_DEBUG_BAUD_RATE;
@@ -148,42 +149,38 @@ KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
if (PortString)
{
/* Move past the actual string */
PortString += strlen("DEBUGPORT");
PortString += CONST_STR_LEN("DEBUGPORT");
/* Now get past any spaces and skip the equal sign */
while (*PortString == ' ') PortString++;
PortString++;
/* Do we have a serial port? */
if (strncmp(PortString, "COM", 3) != 0)
{
if (_strnicmp(PortString, "COM", CONST_STR_LEN("COM")) != 0)
return STATUS_INVALID_PARAMETER;
}
/* Check for a valid serial port */
PortString += 3;
Value = atol(PortString);
if (Value >= sizeof(BaseArray) / sizeof(BaseArray[0]))
{
PortString += CONST_STR_LEN("COM");
Value = (ULONG)atol(PortString);
if (Value > MAX_COM_PORTS)
return STATUS_INVALID_PARAMETER;
}
// if (Value > 0 && Value <= MAX_COM_PORTS)
/* Set the port to use */
ComPortNumber = Value;
}
}
/* Check if we got a baud rate */
if (BaudString)
{
/* Move past the actual string and any spaces */
BaudString += strlen("BAUDRATE");
BaudString += CONST_STR_LEN("BAUDRATE");
while (*BaudString == ' ') BaudString++;
/* Make sure we have a rate */
if (*BaudString)
{
/* Read and set it */
Value = atol(BaudString + 1);
Value = (ULONG)atol(BaudString + 1);
if (Value) ComPortBaudRate = Value;
}
}
drivers/base/kdgdb/kdcom.c
+13 -15
View File
@@ -119,6 +119,8 @@ NTSTATUS
NTAPI
KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
{
#define CONST_STR_LEN(x) (sizeof(x)/sizeof(x[0]) - 1)
ULONG ComPortNumber = DEFAULT_DEBUG_PORT;
ULONG ComPortBaudRate = DEFAULT_DEBUG_BAUD_RATE;
@@ -142,42 +144,38 @@ KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
if (PortString)
{
/* Move past the actual string */
PortString += strlen("DEBUGPORT");
PortString += CONST_STR_LEN("DEBUGPORT");
/* Now get past any spaces and skip the equal sign */
while (*PortString == ' ') PortString++;
PortString++;
/* Do we have a serial port? */
if (strncmp(PortString, "COM", 3) != 0)
{
if (_strnicmp(PortString, "COM", CONST_STR_LEN("COM")) != 0)
return STATUS_INVALID_PARAMETER;
}
/* Check for a valid serial port */
PortString += 3;
Value = atol(PortString);
if (Value >= sizeof(BaseArray) / sizeof(BaseArray[0]))
{
PortString += CONST_STR_LEN("COM");
Value = (ULONG)atol(PortString);
if (Value > MAX_COM_PORTS)
return STATUS_INVALID_PARAMETER;
}
// if (Value > 0 && Value <= MAX_COM_PORTS)
/* Set the port to use */
ComPortNumber = Value;
}
}
/* Check if we got a baud rate */
if (BaudString)
{
/* Move past the actual string and any spaces */
BaudString += strlen("BAUDRATE");
BaudString += CONST_STR_LEN("BAUDRATE");
while (*BaudString == ' ') BaudString++;
/* Make sure we have a rate */
if (*BaudString)
{
/* Read and set it */
Value = atol(BaudString + 1);
Value = (ULONG)atol(BaudString + 1);
if (Value) ComPortBaudRate = Value;
}
}
@@ -226,7 +224,7 @@ KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL)
VOID
NTAPI
KdpSendByte(_In_ UCHAR Byte)
KdpSendByte(IN UCHAR Byte)
{
/* Send the byte */
CpPutByte(&KdComPort, Byte);
@@ -249,7 +247,7 @@ KdpPollByte(OUT PUCHAR OutByte)
KDSTATUS
NTAPI
KdpReceiveByte(_Out_ PUCHAR OutByte)
KdpReceiveByte(OUT PUCHAR OutByte)
{
USHORT CpStatus;