Changeset 73968 in vbox

Timestamp:

Aug 29, 2018 7:32:50 PM (6 years ago)

Author:

vboxsync

Message:

IPRT/rest: Bug fixes. Pet listing works. bugref:9167

Location:

trunk

Files:

• include/iprt/cpp/restbase.h (modified) (5 diffs)
• src/VBox/Runtime/common/rest/RTCRestArrayBase.cpp (modified) (2 diffs)
• src/VBox/Runtime/common/rest/RTCRestClientResponseBase.cpp (modified) (4 diffs)

trunk/include/iprt/cpp/restbase.h

@@ -606 +606 @@
      * @returns true if @a a_idx is valid, false if out of range.
      * @param   a_idx       The index of the element to remove.
+     *                      The value ~(size_t)0 is an alias for the final element.
      */
     bool removeAt(size_t a_idx);
@@ -660 +661 @@
      * @returns VINF_SUCCESS or VWRN_ALREADY_EXISTS on success.
      *          VERR_ALREADY_EXISTS, VERR_NO_MEMORY or VERR_NO_STR_MEMORY on failure.
-     * @param   a_idx           Where to insert it.
+     * @param   a_idx           Where to insert it.  The value ~(size_t)0 is an alias for m_cElements.
      * @param   a_pValue        The value to insert.  Ownership is transferred to the map on success.
      * @param   a_fReplace      Whether to replace existing entry rather than insert.
@@ -671 +672 @@
      * @returns VINF_SUCCESS or VWRN_ALREADY_EXISTS on success.
      *          VERR_ALREADY_EXISTS, VERR_NO_MEMORY or VERR_NO_STR_MEMORY on failure.
-     * @param   a_idx           Where to insert it.
+     * @param   a_idx           Where to insert it.  The value ~(size_t)0 is an alias for m_cElements.
      * @param   a_rValue        The value to copy into the map.
      * @param   a_fReplace      Whether to replace existing key-value pair with matching key.
@@ -1403 +1404 @@
      * Getter for m_pErrInfo.
      */
-    PCRTERRINFO  getErrIfno(void) const { return m_pErrInfo; }
+    PCRTERRINFO getErrInfo(void) const { return m_pErrInfo; }
 
     /**
@@ -1421 +1422 @@
     RTCString   m_strContentType;
 
-    PRTERRINFO  getErrInfo(void);
+    PRTERRINFO  getErrInfoInternal(void);
     void        deleteErrInfo(void);
     void        copyErrInfo(PCRTERRINFO pErrInfo);

trunk/src/VBox/Runtime/common/rest/RTCRestArrayBase.cpp

@@ -310 +310 @@
 
     if (a_idx == ~(size_t)0)
-        a_idx = m_cElements - 1;
+        a_idx = m_cElements;
 
     if (a_idx <= m_cElements)
@@ -333 +333 @@
             m_papElements[a_idx] = a_pValue;
             m_cElements++;
-        }
-        else
-        {
-            /* Replace element. */
-            delete m_papElements[a_idx];
-            m_papElements[a_idx] = a_pValue;
-            return VWRN_ALREADY_EXISTS;
-        }
+            return VINF_SUCCESS;
+        }
+
+        /* Replace element. */
+        delete m_papElements[a_idx];
+        m_papElements[a_idx] = a_pValue;
+        return VWRN_ALREADY_EXISTS;
     }
     return VERR_OUT_OF_RANGE;

trunk/src/VBox/Runtime/common/rest/RTCRestClientResponseBase.cpp

@@ -125 +125 @@
 
 
-PRTERRINFO RTCRestClientResponseBase::getErrInfo(void)
+PRTERRINFO RTCRestClientResponseBase::getErrInfoInternal(void)
 {
     if (m_pErrInfo)
@@ -162 +162 @@
 int RTCRestClientResponseBase::addError(int rc, const char *pszFormat, ...)
 {
-    PRTERRINFO pErrInfo = getErrInfo();
+    PRTERRINFO pErrInfo = getErrInfoInternal();
     if (pErrInfo)
     {
@@ -354 +354 @@
 RTCRestClientResponseBase::PrimaryJsonCursorForBody::PrimaryJsonCursorForBody(RTJSONVAL hValue, const char *pszName,
                                                                               RTCRestClientResponseBase *a_pThat)
-    : RTCRestJsonPrimaryCursor(hValue, pszName, a_pThat->getErrInfo())
+    : RTCRestJsonPrimaryCursor(hValue, pszName, a_pThat->getErrInfoInternal())
     , m_pThat(a_pThat)
 {
@@ -383 +383 @@
 void RTCRestClientResponseBase::deserializeBody(RTCRestObjectBase *a_pDst, const char *a_pchData, size_t a_cbData)
 {
-    if (m_strContentType.startsWith("application/json;"))
+    if (m_strContentType.startsWith("application/json"))
     {
         int rc = RTStrValidateEncodingEx(a_pchData, a_cbData, RTSTR_VALIDATE_ENCODING_EXACT_LENGTH);