Fix Fixed Point convert issue.

BZ: 185336

Convert is failing when trying to convert the string value
to integer value within FixedPointParameterType class.

This patch fixes the issue by requesting to convert the string
into a signed type.

Change-Id: I77987eb1564292bd6dcdd0da4db52c4b4f92818f
Signed-off-by: Francois Gaffie <francois.gaffie@intel.com>
Signed-off-by: Mattijs Korpershoek <mattijsx.korpershoek@intel.com>

1 files changed, 63 insertions, 2 deletions

diff --git a/parameter/FixedPointParameterType.h b/parameter/FixedPointParameterType.h
index 7f204ff..acb638a 100644
--- a/parameter/FixedPointParameterType.h
+++ b/parameter/FixedPointParameterType.h
@@ -64,8 +64,69 @@ private:
     uint32_t getUtilSizeInBits() const;
     // Range computation
     void getRange(double& dMin, double& dMax) const;
-    // Out of range error
-    string getOutOfRangeError(const string& strValue, bool bRawValueSpace, bool bHexaValue) const;
+
+    /**
+     * Checks if a string has the written representation of an hexadecimal number (Which is
+     * the prefix "Ox" in C++).
+     *
+     * @param[in] strValue Parameter read from the XML file representated as a string.
+     *
+     * @return true if the string is written as hexa, false otherwise.
+     */
+    bool isHexadecimal(const string& strValue) const;
+
+    /**
+     * Convert a decimal raw represented string into an unsigned long integer.
+     * In case of a failing conversion or encodability, this function set the error to
+     * illegal value provided and gives the range allowed for the parameter.
+     *
+     * @param[in] strValue Parameter read from the XML file representated as a string in decimal
+     *                     raw format
+     * @param[out] uiValue Parameter representated as a long unsigned integer.
+     * @param[in:out] parameterAccessContext Parameter access context.
+     *
+     * @return true if the string was successfully converted, false otherwise.
+     */
+    bool convertFromDecimal(const string& strValue, uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const;
+
+    /**
+     * Convert an hexadecimal raw represented string into an unsigned long integer.
+     * In case of a failing conversion or encodability, this function set the error to
+     * illegal value provided and gives the range allowed for the parameter.
+     *
+     * @param[in] strValue Parameter read from the XML file representated as a string in hexadecimal
+     *                     raw format
+     * @param[out] uiValue Parameter representated as a long unsigned integer.
+     * @param[in:out] parameterAccessContext Parameter access context.
+     *
+     * @return true if the string was successfully converted, false otherwise.
+     */
+    bool convertFromHexadecimal(const string& strValue, uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const;
+
+    /**
+     * Convert a QI QF represented string into an unsigned long integer.
+     * In case of a failing conversion or encodability, this function set the error to
+     * illegal value provided and gives the range allowed for the parameter.
+     *
+     * @param[in] strValue Parameter read from the XML file representated as a string in QIQF
+     *                     representation.
+     * @param[out] uiValue Parameter representated as a long unsigned integer.
+     * @param[in:out] parameterAccessContext Parameter access context.
+     *
+     * @return true if the string was successfully converted, false otherwise.
+     */
+    bool convertFromQiQf(const string& strValue, uint32_t& uiValue, CParameterAccessContext& parameterAccessContext) const;
+
+    /**
+     * Set the out of range error.
+     * In case of a failing conversion or encodability, this function set the error to
+     * illegal value provided and gives the range allowed for the parameter.
+     *
+     * @param[in] strValue Parameter read from the XML file representated as a string
+     * @param[in:out] parameterAccessContext Parameter Access Context
+     */
+    void setOutOfRangeError(const string& strValue, CParameterAccessContext& parameterAccessContext) const;
+
     // Check if data is encodable
     bool checkValueAgainstRange(double dValue) const;
     // Data conversion