Changeset 73977 in vbox for trunk/src/VBox/Runtime/common/rest

Timestamp:

Aug 30, 2018 12:13:02 PM (7 years ago)

Author:

vboxsync

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

124713

Message:

IPRT/rest: More request array and map setter methods. Fixed string defaults. Safer copying and resetToDefaults. bugref:9167

Location:

trunk/src/VBox/Runtime/common/rest

Files:

• RTCRestArrayBase.cpp (modified) (2 diffs)
• RTCRestClientApiBase.cpp (modified) (3 diffs)
• RTCRestClientRequestBase.cpp (modified) (3 diffs)
• RTCRestClientResponseBase.cpp (modified) (1 diff)
• RTCRestJsonPrimaryCursor.cpp (modified) (1 diff)
• RTCRestOutputToString.cpp (modified) (1 diff)
• RTCRestStringMapBase.cpp (modified) (2 diffs)
• rest-primary-object-types.cpp (modified) (7 diffs)

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_REST
 #include <iprt/cpp/restbase.h>
 
@@ -83 +84 @@
 *********************************************************************************************************************************/
 
-void RTCRestArrayBase::resetToDefault()
+int RTCRestArrayBase::resetToDefault()
 {
     /* The default state of an array is empty. At least for now. */
     clear();
+    return VINF_SUCCESS;
 }
 

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_REST
 #include <iprt/cpp/restbase.h>
 
 #include <iprt/err.h>
 #include <iprt/http.h>
+#include <iprt/log.h>
 
 
@@ -62 +64 @@
 
 void RTCRestClientApiBase::doCall(RTCRestClientRequestBase const &a_rRequest, RTHTTPMETHOD a_enmHttpMethod,
-                                  RTCRestClientResponseBase *a_pResponse)
+                                  RTCRestClientResponseBase *a_pResponse, const char *a_pszMethod)
 {
+    LogFlow(("doCall: %s %s\n", a_pszMethod, RTHttpMethodName(a_enmHttpMethod)));
+
     /*
      * Initialize the HTTP instance.
@@ -155 +159 @@
     }
     a_pResponse->receiveComplete(rc, hHttp);
+    RT_NOREF_PV(a_pszMethod);
 }
 

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_REST
 #include <iprt/cpp/restbase.h>
 
@@ -37 +38 @@
 /**
  * Default constructor.
- *  */
+ */
 RTCRestClientRequestBase::RTCRestClientRequestBase()
+    : m_fIsSet(0)
+    , m_fErrorSet(0)
 {
-    /* nothing to do */
+}
+
+
+/**
+ * Copy constructor.
+ */
+RTCRestClientRequestBase::RTCRestClientRequestBase(RTCRestClientRequestBase const &a_rThat)
+    : m_fIsSet(a_rThat.m_fIsSet)
+    , m_fErrorSet(a_rThat.m_fErrorSet)
+{
 }
 
@@ -50 +62 @@
 {
     /* nothing to do */
+}
+
+
+/**
+ * Copy assignment operator.
+ */
+RTCRestClientRequestBase &RTCRestClientRequestBase::operator=(RTCRestClientRequestBase const &a_rThat)
+{
+    m_fIsSet    = a_rThat.m_fIsSet;
+    m_fErrorSet = a_rThat.m_fErrorSet;
+    return *this;
 }
 

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_REST
 #include <iprt/cpp/restbase.h>
 

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_REST
 #include <iprt/cpp/restbase.h>
 

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_REST
 #include <iprt/cpp/restbase.h>
 

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_REST
 #include <iprt/cpp/restbase.h>
 
@@ -72 +73 @@
 *********************************************************************************************************************************/
 
-void RTCRestStringMapBase::resetToDefault()
+int RTCRestStringMapBase::resetToDefault()
 {
     /* Default is an empty map. */
     clear();
+    return VINF_SUCCESS;
 }
 

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

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
+#define LOG_GROUP RTLOGGROUP_REST
 #include <iprt/cpp/restbase.h>
 
@@ -143 +144 @@
 
 
-void RTCRestBool::resetToDefault()
+int RTCRestBool::assignCopy(RTCRestBool const &a_rThat)
+{
+    m_fValue = a_rThat.m_fValue;
+    return VINF_SUCCESS;
+}
+
+
+int RTCRestBool::resetToDefault()
 {
     m_fValue = false;
+    return VINF_SUCCESS;
 }
 
@@ -265 +274 @@
 
 
-void RTCRestInt64::resetToDefault()
+int RTCRestInt64::assignCopy(RTCRestInt64 const &a_rThat)
+{
+    m_iValue = a_rThat.m_iValue;
+    return VINF_SUCCESS;
+}
+
+
+int RTCRestInt64::resetToDefault()
 {
     m_iValue = 0;
+    return VINF_SUCCESS;
 }
 
@@ -375 +392 @@
 
 
-void RTCRestInt32::resetToDefault()
+int RTCRestInt32::assignCopy(RTCRestInt32 const &a_rThat)
+{
+    m_iValue = a_rThat.m_iValue;
+    return VINF_SUCCESS;
+}
+
+
+int RTCRestInt32::resetToDefault()
 {
     m_iValue = 0;
+    return VINF_SUCCESS;
 }
 
@@ -491 +516 @@
 
 
-void RTCRestInt16::resetToDefault()
+int RTCRestInt16::assignCopy(RTCRestInt16 const &a_rThat)
+{
+    m_iValue = a_rThat.m_iValue;
+    return VINF_SUCCESS;
+}
+
+
+int RTCRestInt16::resetToDefault()
 {
     m_iValue = 0;
+    return VINF_SUCCESS;
 }
 
@@ -598 +631 @@
 
 
-void RTCRestDouble::resetToDefault()
+/** Copy assignment operator. */
+RTCRestDouble &RTCRestDouble::operator=(RTCRestDouble const &a_rThat)
+{
+    m_rdValue = a_rThat.m_rdValue;
+    return *this;
+}
+
+
+int RTCRestDouble::assignCopy(RTCRestDouble const &a_rThat)
+{
+    m_rdValue = a_rThat.m_rdValue;
+    return VINF_SUCCESS;
+}
+
+
+int RTCRestDouble::resetToDefault()
 {
     m_rdValue = 0.0;
+    return VINF_SUCCESS;
 }
 
@@ -715 +764 @@
 
 
-void RTCRestString::resetToDefault()
+int RTCRestString::assignCopy(RTCString const &a_rThat)
+{
+    return assignNoThrow(a_rThat);
+}
+
+
+int RTCRestString::assignCopy(const char *a_pszThat)
+{
+    return assignNoThrow(a_pszThat);
+}
+
+
+int RTCRestString::resetToDefault()
 {
     setNull();
+    return VINF_SUCCESS;
 }