fixup! api: refactor coap_receive

iotivity · Aug 8, 2023 · 950aa1a · 950aa1a
1 parent 50117e4
commit 950aa1a
Show file tree

Hide file tree

Showing 18 changed files with 1,830 additions and 848 deletions.
diff --git a/api/client/oc_client_cb.c b/api/client/oc_client_cb.c
@@ -323,11 +323,17 @@ ri_get_ocf_version(oc_content_format_t cf)
   return OCF_VER_1_0_0;
 }
 
+#ifdef OC_BLOCK_WISE
 static oc_client_response_t
 ri_prepare_client_response(const coap_packet_t *packet,
                            oc_blockwise_state_t **response_state,
                            oc_client_cb_t *cb, oc_endpoint_t *endpoint,
                            oc_content_format_t cf)
+#else  /* !OC_BLOCK_WISE */
+static oc_client_response_t
+ri_prepare_client_response(const coap_packet_t *packet, oc_client_cb_t *cb,
+                           oc_endpoint_t *endpoint, oc_content_format_t cf)
+#endif /* OC_BLOCK_WISE */
 {
   oc_client_response_t client_response;
   memset(&client_response, 0, sizeof(oc_client_response_t));
@@ -351,7 +357,6 @@ ri_prepare_client_response(const coap_packet_t *packet,
     }
   }
 #else  /* !OC_BLOCK_WISE */
-  (void)response_state;
   coap_options_get_observe(packet, &client_response.observe_option);
 #endif /* OC_BLOCK_WISE */
 
@@ -406,7 +411,7 @@ oc_client_cb_invoke(const coap_packet_t *response, oc_client_cb_t *cb,
     ri_prepare_client_response(response, response_state, cb, endpoint, cf);
 #else  /* !OC_BLOCK_WISE */
   oc_client_response_t client_response =
-    ri_prepare_client_response(response, NULL, cb, endpoint, cf);
+    ri_prepare_client_response(response, cb, endpoint, cf);
 #endif /* OC_BLOCK_WISE */
 
 #if defined(OC_OSCORE) && defined(OC_SECURITY)

diff --git a/api/client/oc_client_cb_internal.h b/api/client/oc_client_cb_internal.h
@@ -26,6 +26,10 @@
 #include "oc_ri.h"
 #include "util/oc_compiler.h"
 
+#ifdef OC_BLOCK_WISE
+#include "api/oc_blockwise_internal.h"
+#endif /* OC_BLOCK_WISE */
+
 #include <stdbool.h>
 
 #ifdef __cplusplus

diff --git a/api/cloud/oc_cloud_apis.c b/api/cloud/oc_cloud_apis.c
@@ -31,6 +31,7 @@
 #include "oc_cloud_internal.h"
 #include "oc_cloud_store_internal.h"
 #include "oc_core_res.h"
+#include "port/oc_connectivity.h"
 #include "port/oc_log_internal.h"
 #include "rd_client_internal.h"