Skip to content

Commit d4c25ac

Browse files
authored
Merge pull request #161 from DenverM80/eject_storage_domain_payload
Remove request payload from eject_storage_domain_spectra_s3_request
2 parents 353a38a + 3b4e97c commit d4c25ac

File tree

2 files changed

+1170
-1031
lines changed

2 files changed

+1170
-1031
lines changed

src/ds3.c

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3162,15 +3162,13 @@ ds3_request* ds3_init_eject_storage_domain_blobs_spectra_s3_request(const char*
31623162

31633163
return (ds3_request*) request;
31643164
}
3165-
ds3_request* ds3_init_eject_storage_domain_spectra_s3_request(const char* storage_domain_id, const ds3_bulk_object_list_response* object_list) {
3165+
ds3_request* ds3_init_eject_storage_domain_spectra_s3_request(const char* storage_domain_id) {
31663166
struct _ds3_request* request = _common_request_init(HTTP_PUT, _build_path("/_rest_/tape/", NULL, NULL));
31673167
_set_query_param((ds3_request*) request, "operation", "EJECT");
31683168

31693169
if (storage_domain_id != NULL) {
31703170
_set_query_param((ds3_request*) request, "storage_domain_id", storage_domain_id);
31713171
}
3172-
request->object_list = (ds3_bulk_object_list_response*) object_list;
3173-
31743172
return (ds3_request*) request;
31753173
}
31763174
ds3_request* ds3_init_eject_tape_spectra_s3_request(const char* resource_id) {
@@ -14213,6 +14211,7 @@ static ds3_error* _parse_top_level_ds3_list_multi_part_uploads_result_response(c
1421314211
}
1421414212
static ds3_paging* _parse_paging_headers(ds3_string_multimap* response_headers) {
1421514213
ds3_paging* response_paging = NULL;
14214+
1421614215
ds3_str* page_truncated_key = ds3_str_init("Page-Truncated");
1421714216
ds3_str* total_result_count_key = ds3_str_init("Total-Result-Count");
1421814217

@@ -14246,6 +14245,7 @@ static ds3_paging* _parse_paging_headers(ds3_string_multimap* response_headers)
1424614245
return response_paging;
1424714246
}
1424814247

14248+
1424914249
ds3_error* ds3_abort_multi_part_upload_request(const ds3_client* client, const ds3_request* request) {
1425014250

1425114251
int num_slashes = num_chars_in_ds3_str(request->path, '/');
@@ -16242,7 +16242,6 @@ ds3_error* ds3_replicate_put_job_spectra_s3_request(const ds3_client* client, co
1624216242
ds3_error* error;
1624316243
ds3_xml_send_buff send_buff;
1624416244
GByteArray* xml_blob;
16245-
ds3_str* _response;
1624616245

1624716246
int num_slashes = num_chars_in_ds3_str(request->path, '/');
1624816247
if (num_slashes < 2 || ((num_slashes == 2) && ('/' == request->path->value[request->path->size-1]))) {
@@ -18423,22 +18422,14 @@ ds3_error* ds3_eject_storage_domain_blobs_spectra_s3_request(const ds3_client* c
1842318422
}
1842418423
ds3_error* ds3_eject_storage_domain_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_tape_failure_list_response** response) {
1842518424
ds3_error* error;
18426-
ds3_xml_send_buff send_buff;
1842718425
GByteArray* xml_blob;
1842818426

1842918427
if (request->path->size < 2) {
1843018428
return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The resource type parameter is required.");
1843118429
}
1843218430

18433-
error = _init_request_payload(request, &send_buff, GET_PHYSICAL_PLACEMENT);
18434-
if (error != NULL) return error;
18435-
1843618431
xml_blob = g_byte_array_new();
18437-
error = _internal_request_dispatcher(client, request, xml_blob, ds3_load_buffer, (void*) &send_buff, _ds3_send_xml_buff, NULL);
18438-
18439-
// Clean up the data sent to the server
18440-
xmlFree(send_buff.buff);
18441-
18432+
error = _internal_request_dispatcher(client, request, xml_blob, ds3_load_buffer, NULL, NULL, NULL);
1844218433
if (error != NULL) {
1844318434
g_byte_array_free(xml_blob, TRUE);
1844418435
return error;

0 commit comments

Comments
 (0)