Review fixes #3

Author: trantanen

app/src/sm_at_gnss.c

@@ -322,8 +322,11 @@ static void agnss_requestor(struct k_work *)
 	int err;
 	struct nrf_modem_gnss_agnss_data_frame req;
 	struct nrf_cloud_coap_agnss_request request = {
-		NRF_CLOUD_COAP_AGNSS_REQ_CUSTOM,
-		&req,
+		.type = NRF_CLOUD_COAP_AGNSS_REQ_CUSTOM,
+		.agnss_req = &req,
+		.net_info = NULL,
+		.filtered = false,
+		.mask_angle = 0,
 	};
 	char *agnss_rest_data_buf = calloc(1, NRF_CLOUD_AGNSS_MAX_DATA_SIZE);
 
@@ -339,9 +342,9 @@ static void agnss_requestor(struct k_work *)
 	}
 
 	struct nrf_cloud_coap_agnss_result result = {
-		agnss_rest_data_buf,
-		NRF_CLOUD_AGNSS_MAX_DATA_SIZE,
-		0
+		.buf = agnss_rest_data_buf,
+		.buf_sz = NRF_CLOUD_AGNSS_MAX_DATA_SIZE,
+		.agnss_sz = 0,
 	};
 
 #if defined(CONFIG_SM_NRF_CLOUD_LOCATION)
@@ -352,7 +355,11 @@ static void agnss_requestor(struct k_work *)
 	} else {
 		LOG_WRN("Requesting A-GNSS data without location assistance");
 		free(net_info);
+		net_info = NULL;
 	}
+#else
+	LOG_INF("Requesting A-GNSS data without location assistance "
+		"since CONFIG_SM_NRF_CLOUD_LOCATION is not defined");
 #endif
 	err = nrf_cloud_coap_agnss_data_get(&request, &result);
 #if defined(CONFIG_SM_NRF_CLOUD_LOCATION)

app/src/sm_at_nrfcloud.c

@@ -28,6 +28,9 @@ static char nrfcloud_device_id[NRF_CLOUD_CLIENT_ID_MAX_LEN];
 
 bool sm_nrf_cloud_ready;
 bool sm_nrf_cloud_send_location;
+/* Parameters saved before submitting connection work. */
+static bool nrfcloud_connect;
+static bool nrfcloud_conn_send_location;
 
 static void nrfcloud_conn_work_fn(struct k_work *work);
 K_WORK_DEFINE(nrfcloud_conn_work, nrfcloud_conn_work_fn);
@@ -78,10 +81,6 @@ K_WORK_DELAYABLE_DEFINE(ncellmeas_timeout_backup_work, ncellmeas_timeout_backup_
 /* Signals completion of an AT%NCELLMEAS measurement (%NCELLMEAS URC). */
 K_SEM_DEFINE(ncellmeas_sem_ncellmeas_evt, 0, 1);
 
-/* Parameters saved before submitting connection work. */
-static bool nrfcloud_connect;
-static bool nrfcloud_conn_send_location;
-
 /* nRF Cloud location request cellular data. */
 static struct lte_lc_cells_info *nrfcloud_cell_data;