Fix type conversion with selections

HDFGroup · Feb 28, 2024 · 3720b46 · 3720b46
1 parent b82f322
commit 3720b46
Show file tree

Hide file tree

Showing 3 changed files with 127 additions and 99 deletions.
diff --git a/src/rest_vol.c b/src/rest_vol.c
@@ -3661,11 +3661,8 @@ RV_curl_multi_perform(CURL *curl_multi_handle, dataset_transfer_info *transfer_i
                     transfer_info[handle_index].curl_easy_handle = NULL;
 
                     if (transfer_info[handle_index].transfer_type == WRITE) {
-                        RV_free(transfer_info[handle_index].u.write_info.write_body);
-                        transfer_info[handle_index].u.write_info.write_body = NULL;
-
-                        RV_free(transfer_info[handle_index].u.write_info.base64_encoded_values);
-                        transfer_info[handle_index].u.write_info.base64_encoded_values = NULL;
+                        RV_free(transfer_info[handle_index].u.write_info.alloc_write_buffer);
+                        transfer_info[handle_index].u.write_info.alloc_write_buffer = NULL;
                     }
 
                     RV_free(transfer_info[handle_index].request_url);

diff --git a/src/rest_vol.h b/src/rest_vol.h
@@ -569,9 +569,8 @@ struct RV_object_t {
 
 /* Structures to hold information for cURL requests to read/write to datasets */
 typedef struct dataset_write_info {
-    char       *write_body;
-    char       *base64_encoded_values;
-    curl_off_t  write_len;
+    /* This points to the dynamically allocated buffer for write, if any */
+    char       *alloc_write_buffer;
     upload_info uinfo;
 } dataset_write_info;
 
@@ -601,7 +600,6 @@ typedef struct dataset_transfer_info {
     char        *selection_body;
 
     /* Fields for type conversion */
-    void *tconv_buf;
     void *bkg_buf;
 
     transfer_type_t transfer_type;