Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 13:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update tracert.cpp

Browse source 
Condensed two functions with similar code into one function. Removed a header that was not needed.
This commit is contained in:
Curtis Wilson 2025-03-30 10:00:31 -04:00 committed by GitHub
parent 46306f9e7e
commit 78c8fd7bea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 32 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

86
base/applications/network/tracert/tracert.cpp
View file

@ -13,7 +13,6 @@
#include <windef.h> #include <windef.h>
#include <winbase.h> #include <winbase.h>
#include <winuser.h> #include <winuser.h>
#include <winnls.h>
#define _INC_WINDOWS #define _INC_WINDOWS
#include <stdlib.h> #include <stdlib.h>
#include <winsock2.h> #include <winsock2.h>
@ -36,6 +35,8 @@
#define NUM_OF_PINGS 3 #define NUM_OF_PINGS 3
#define MIN_HOP_COUNT 1 #define MIN_HOP_COUNT 1
#define MAX_HOP_COUNT 255 #define MAX_HOP_COUNT 255
#define MIN_MILLISECONDS 1
#define MAX_MILLISECONDS ULONG_MAX
struct TraceInfo struct TraceInfo
{ {
@ -168,9 +169,7 @@ GetULONG(
// check input arguments // check input arguments
if (String == NULL || Value == NULL || *String == UNICODE_NULL) if (String == NULL || Value == NULL || *String == UNICODE_NULL)
{
return false; return false;
}
// clear errno so we can use its value // clear errno so we can use its value
// after the call to wcstoul to check for errors // after the call to wcstoul to check for errors
@ -179,9 +178,7 @@ GetULONG(
// try to convert String to ULONG // try to convert String to ULONG
*Value = wcstoul(String, &StopString, 10); *Value = wcstoul(String, &StopString, 10);
if ((errno != ERANGE) && (errno != 0 || *StopString != UNICODE_NULL)) if ((errno != ERANGE) && (errno != 0 || *StopString != UNICODE_NULL))
{
return false; return false;
}
// the conversion was successful // the conversion was successful
return true; return true;
@ -573,57 +570,19 @@ Cleanup:
} }
static bool static bool
GetOptionNumberOfHops( GetUlongOptionInRange(
_In_ int argc, _In_ int argc,
_In_ wchar_t *argv[], _In_ wchar_t *argv[],
_Inout_ int *i, _Inout_ int *i,
_Out_ ULONG *Value) _Out_ ULONG *Value,
_In_ ULONG MinimumValue,
_In_ ULONG MaximumValue)
{ {
ULONG NumberOfHops = 0; ULONG ParsedValue = 0;
// check input arguments // check input arguments
if (argv == NULL || i == NULL || Value == NULL) if (argv == NULL || i == NULL || Value == NULL)
{
return false; return false;
}
// see if we have enough values
if ((*i + 1) > (argc - 1))
{
OutputText(IDS_MISSING_OPTION_VALUE, argv[*i]);
return false;
}
(*i)++;
// try to parse and convert value as UULONG
// check if Timeout is within valid range
if (!GetULONG(argv[*i], &NumberOfHops)
|| ((NumberOfHops < MIN_HOP_COUNT) || (NumberOfHops > MAX_HOP_COUNT)))
{
(*i)--;
OutputText(IDS_BAD_OPTION_VALUE, argv[*i]);
return false;
}
*Value = NumberOfHops;
return true;
}
static bool
GetOptionTimeout(
_In_ int argc,
_In_ wchar_t *argv[],
_Inout_ int *i,
_Out_ ULONG *Value)
{
ULONG Timeout = 0;
// check input arguments
if (argv == NULL || i == NULL || Value == NULL)
{
return false;
}
// see if we have enough values // see if we have enough values
if ((*i + 1) > (argc - 1)) if ((*i + 1) > (argc - 1))
@ -635,17 +594,24 @@ GetOptionTimeout(
(*i)++; (*i)++;
// try to parse and convert value as ULONG // try to parse and convert value as ULONG
// check if Timeout is within valid range // check if ParsedValue is within specified range
if (!GetULONG(argv[*i], &Timeout) || (Timeout < 1)) if (!GetULONG(argv[*i], &ParsedValue)
|| ((ParsedValue < MinimumValue) || (ParsedValue > MaximumValue)))
{ {
// if we get here then Timeout is less then 1 or somthing other // if GetULONG Fails we need to check ERANGE to see if
// then a numeric value // it was due to the value being out of range
if (errno == ERANGE)
{
*Value = ParsedValue;
return true;
}
(*i)--; (*i)--;
OutputText(IDS_BAD_OPTION_VALUE, argv[*i]); OutputText(IDS_BAD_OPTION_VALUE, argv[*i]);
return false; return false;
} }
*Value = Timeout; *Value = ParsedValue;
return true; return true;
} }
@ -669,7 +635,12 @@ ParseCmdline(int argc, wchar_t *argv[])
break; break;
case 'h': case 'h':
if (GetOptionNumberOfHops(argc, argv, &i, &Info.MaxHops) == false) if (!GetUlongOptionInRange(argc,
argv,
&i,
&Info.MaxHops,
MIN_HOP_COUNT,
MAX_HOP_COUNT))
return false; return false;
break; break;
@ -678,7 +649,12 @@ ParseCmdline(int argc, wchar_t *argv[])
return false; return false;
case 'w': case 'w':
if (GetOptionTimeout(argc, argv, &i, &Info.Timeout) == false) if (!GetUlongOptionInRange(argc,
argv,
&i,
&Info.Timeout,
MIN_MILLISECONDS,
MAX_MILLISECONDS))
return false; return false;
break; break;