tests: mgmt: mcumgr: os_mgmt_info: Update callback format

Updates the format of the MCUmgr callback to use the new style.

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

tests/subsys/mgmt/mcumgr/os_mgmt_info/src/main.c

@@ -124,36 +124,40 @@ const uint8_t query_all[] = "a";
 const uint8_t query_test_cmd[] = "k";
 
 #ifdef CONFIG_MCUMGR_GRP_OS_INFO_CUSTOM_HOOKS
-static int32_t os_mgmt_info_custom_os_callback(uint32_t event, int32_t rc, bool *abort_more,
-					       void *data, size_t data_size)
+static enum mgmt_cb_return os_mgmt_info_custom_os_callback(uint32_t event,
+							   enum mgmt_cb_return prev_status,
+							   int32_t *rc, uint16_t *group,
+							   bool *abort_more, void *data,
+							   size_t data_size)
 {
 	if (event == MGMT_EVT_OP_OS_MGMT_INFO_CHECK) {
 		struct os_mgmt_info_check *check_data = (struct os_mgmt_info_check *)data;
 
 		*check_data->custom_os_name = true;
 	} else if (event == MGMT_EVT_OP_OS_MGMT_INFO_APPEND) {
-		int rc;
+		int int_rc;
 		struct os_mgmt_info_append *append_data = (struct os_mgmt_info_append *)data;
 
 		if (*append_data->format_bitmask & OS_MGMT_INFO_FORMAT_OPERATING_SYSTEM) {
-			rc = snprintf(&append_data->output[*append_data->output_length],
-				      (append_data->buffer_size - *append_data->output_length),
-				      "%s%s", (*append_data->prior_output == true ? " " : ""),
-				      CONFIG_CUSTOM_OS_NAME_VALUE);
+			int_rc = snprintf(&append_data->output[*append_data->output_length],
+					  (append_data->buffer_size - *append_data->output_length),
+					  "%s%s", (*append_data->prior_output == true ? " " : ""),
+					  CONFIG_CUSTOM_OS_NAME_VALUE);
 
-			if (rc < 0 ||
-			    rc >= (append_data->buffer_size - *append_data->output_length)) {
+			if (int_rc < 0 ||
+			    int_rc >= (append_data->buffer_size - *append_data->output_length)) {
 				*abort_more = true;
-				return -1;
+				*rc = -1;
+				return MGMT_CB_ERROR_RC;
 			}
 
-			*append_data->output_length += (uint16_t)rc;
+			*append_data->output_length += (uint16_t)int_rc;
 			*append_data->prior_output = true;
 			*append_data->format_bitmask &= ~OS_MGMT_INFO_FORMAT_OPERATING_SYSTEM;
 		}
 	}
 
-	return MGMT_ERR_EOK;
+	return MGMT_CB_OK;
 }
 
 static struct mgmt_callback custom_os_check_callback = {
@@ -166,8 +170,11 @@ static struct mgmt_callback custom_os_append_callback = {
 	.event_id = MGMT_EVT_OP_OS_MGMT_INFO_APPEND,
 };
 
-static int32_t os_mgmt_info_custom_cmd_callback(uint32_t event, int32_t rc, bool *abort_more,
-						void *data, size_t data_size)
+static enum mgmt_cb_return os_mgmt_info_custom_cmd_callback(uint32_t event,
+							    enum mgmt_cb_return prev_status,
+							    int32_t *rc, uint16_t *group,
+							    bool *abort_more, void *data,
+							    size_t data_size)
 {
 	if (event == MGMT_EVT_OP_OS_MGMT_INFO_CHECK) {
 		struct os_mgmt_info_check *check_data = (struct os_mgmt_info_check *)data;
@@ -182,23 +189,24 @@ static int32_t os_mgmt_info_custom_cmd_callback(uint32_t event, int32_t rc, bool
 			++i;
 		}
 	} else if (event == MGMT_EVT_OP_OS_MGMT_INFO_APPEND) {
-		int rc;
+		int int_rc;
 		struct os_mgmt_info_append *append_data = (struct os_mgmt_info_append *)data;
 
 		if (append_data->all_format_specified ||
 		    (*append_data->format_bitmask & QUERY_TEST_CMD_BITMASK)) {
-			rc = snprintf(&append_data->output[*append_data->output_length],
-				      (append_data->buffer_size - *append_data->output_length),
-				      "%sMagic Output for Test",
-				      (*append_data->prior_output == true ? " " : ""));
+			int_rc = snprintf(&append_data->output[*append_data->output_length],
+					  (append_data->buffer_size - *append_data->output_length),
+					  "%sMagic Output for Test",
+					  (*append_data->prior_output == true ? " " : ""));
 
-			if (rc < 0 ||
-			    rc >= (append_data->buffer_size - *append_data->output_length)) {
+			if (int_rc < 0 ||
+			    int_rc >= (append_data->buffer_size - *append_data->output_length)) {
 				*abort_more = true;
-				return -1;
+				*rc = -1;
+				return MGMT_CB_ERROR_RC;
 			}
 
-			*append_data->output_length += (uint16_t)rc;
+			*append_data->output_length += (uint16_t)int_rc;
 			*append_data->prior_output = true;
 			*append_data->format_bitmask &= ~QUERY_TEST_CMD_BITMASK;
 		}