return (FALSE);\r
}\r
\r
+/**\r
+ Function to determine whether a string is decimal or hex representation of a number\r
+ and return the number converted from the string.\r
+\r
+ @param[in] String String representation of a number\r
+\r
+ @return the number\r
+ @retval (UINTN)(-1) An error ocurred.\r
+**/\r
+UINTN\r
+EFIAPI\r
+ReturnUintn(\r
+ IN CONST CHAR16 *String\r
+ )\r
+{\r
+ UINT64 RetVal;\r
+\r
+ if (!EFI_ERROR(ShellConvertStringToUint64(String, &RetVal, FALSE, FALSE))) {\r
+ return ((UINTN)RetVal);\r
+ }\r
+ return ((UINTN)(-1));\r
+}\r
+\r
/**\r
Function for 'for' command.\r
\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (ArgSetWalker[0] == L'-') {\r
- Info->Current = 0 - (INTN)ShellStrToUintn(ArgSetWalker+1);\r
+ Info->Current = 0 - (INTN)ReturnUintn(ArgSetWalker+1);\r
} else {\r
- Info->Current = (INTN)ShellStrToUintn(ArgSetWalker);\r
+ Info->Current = (INTN)ReturnUintn(ArgSetWalker);\r
}\r
ArgSetWalker = StrStr(ArgSetWalker, L" ");\r
while (ArgSetWalker != NULL && ArgSetWalker[0] == L' ') {\r
ShellStatus = SHELL_INVALID_PARAMETER;\r
} else {\r
if (ArgSetWalker[0] == L'-') {\r
- Info->End = 0 - (INTN)ShellStrToUintn(ArgSetWalker+1);\r
+ Info->End = 0 - (INTN)ReturnUintn(ArgSetWalker+1);\r
} else {\r
- Info->End = (INTN)ShellStrToUintn(ArgSetWalker);\r
+ Info->End = (INTN)ReturnUintn(ArgSetWalker);\r
}\r
if (Info->Current < Info->End) {\r
Info->Step = 1;\r
ASSERT(Info->Step == 1 || Info->Step == -1);\r
} else {\r
if (ArgSetWalker[0] == L'-') {\r
- Info->Step = 0 - (INTN)ShellStrToUintn(ArgSetWalker+1);\r
+ Info->Step = 0 - (INTN)ReturnUintn(ArgSetWalker+1);\r
} else {\r
- Info->Step = (INTN)ShellStrToUintn(ArgSetWalker);\r
+ Info->Step = (INTN)ReturnUintn(ArgSetWalker);\r
}\r
\r
if (StrStr(ArgSetWalker, L" ") != NULL) {\r