//
-// Open Service Platform
// Copyright (c) 2012 Samsung Electronics Co., Ltd.
//
// Licensed under the Apache License, Version 2.0 (the License);
"[%s] The length of s MUST be greater than 0.", GetErrorMessage(E_NUM_FORMAT));
int radix = 0;
+ int startIndex = 0;
+ int minLength = 2;
wchar_t* pEnd = null;
String str(s);
+ if (s[0] == L'-' || s[0] == L'+')
+ {
+ startIndex = 1;
+ minLength = 3;
+ }
+
// Find radix
- if (s[0] == L'#')
+ if (s[startIndex] == L'#')
{
radix = Character::RADIX_HEXADECIMAL;
// Remove '#'
- str.Remove(0, 1);
+ str.Remove(startIndex, 1);
}
- else if (s[0] == L'0' && (s.GetLength() >= 2))
+ else if (s[startIndex] == L'0' && (s.GetLength() >= minLength))
{
- if (s[1] == L'x' || s[1] == L'X')
+ if (s[startIndex + 1] == L'x' || s[startIndex + 1] == L'X')
{
radix = Character::RADIX_HEXADECIMAL;
}
(radix == Character::RADIX_DECIMAL) || (radix == Character::RADIX_HEXADECIMAL)), E_OUT_OF_RANGE, E_OUT_OF_RANGE,
"[%s] The radix(%d) MUST be one of 2, 8, 10 and 16.", GetErrorMessage(E_OUT_OF_RANGE), radix);
- wchar_t* pEnd = null;
-
int len = s.GetLength();
SysTryReturn(NID_BASE, (len > 0), E_NUM_FORMAT, E_NUM_FORMAT, "[%s] The length of s MUST be greater than 0.",
GetErrorMessage(E_NUM_FORMAT));
errno = 0;
- ret = wcstol(s.GetPointer(), &pEnd, radix);
+ wchar_t* pEnd = null;
+ int tmpRet = wcstol(s.GetPointer(), &pEnd, radix);
SysTryReturn(NID_BASE, (pEnd[0] == 0), E_NUM_FORMAT, E_NUM_FORMAT,
"[%s] Integer parse failed. Scan stopped at (%ls).", GetErrorMessage(E_NUM_FORMAT), pEnd);
- SysTryReturn(NID_BASE, !((ret == LONG_MAX || ret == LONG_MIN) && (errno != 0)), E_NUM_FORMAT, E_NUM_FORMAT,
+ SysTryReturn(NID_BASE, !((tmpRet == LONG_MAX || tmpRet == LONG_MIN) && (errno != 0)), E_NUM_FORMAT, E_NUM_FORMAT,
"[%s] Parsed value cannot fit into an Integer.", GetErrorMessage(E_NUM_FORMAT));
+ ret = tmpRet;
return E_SUCCESS;
}