Changeset 74181 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Sep 10, 2018 12:43:30 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

124956

Message:

IPRT/rest: Wrote unit tests for RTCRestDate. Addressed some issues found. Marked methods implemented in headers with 'inline'. bugref:9167

File:

• trunk/src/VBox/Runtime/common/rest/rest-primary-object-types.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/common/rest/rest-primary-object-types.cpp

@@ -1398 +1398 @@
 int RTCRestDate::deserializeFromJson(RTCRestJsonCursor const &a_rCursor)
 {
+    setNull();
+
     RTJSONVALTYPE enmType = RTJsonValueGetType(a_rCursor.m_hValue);
     if (enmType == RTJSONVALTYPE_STRING)
@@ -1419 +1421 @@
 
     if (enmType == RTJSONVALTYPE_NULL)
-    {
-        setNull();
-        return VINF_SUCCESS;
-    }
+        return VINF_SUCCESS;
 
     return a_rCursor.m_pPrimary->addError(a_rCursor, VERR_REST_WRONG_JSON_TYPE_FOR_DATE, "wrong JSON type for date: %s",
@@ -1446 +1445 @@
                             uint32_t a_fFlags /*= kCollectionFormat_Unspecified*/)
 {
+    setNull();
     if (a_rValue.startsWithWord("null", RTCString::CaseInsensitive))
-    {
-        setNull();
-        return VINF_SUCCESS;
-    }
+        return VINF_SUCCESS;
 
     int rc = m_strFormatted.assignNoThrow(a_rValue);
@@ -1598 +1595 @@
 int RTCRestDate::format(kFormat a_enmFormat)
 {
-    m_fNullIndicator = true;
-    m_enmFormat = a_enmFormat;
+    m_fNullIndicator = false;
+    m_fTimeSpecOkay  = true;
+    m_enmFormat      = a_enmFormat;
     int rc;
     switch (a_enmFormat)