Skip to content

Latest 5.0 API #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rpmoore merged 14 commits into from
Mar 27, 2018
Merged

Latest 5.0 API #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
600c7ec
Created ds3_uint64_string_map
RachelTucker Mar 1, 2018
e23f1a2
Manually added blob checksum parsing to head object command
RachelTucker Mar 5, 2018
ae31977
Autogened 4.1 API with blob checksum header parsing
RachelTucker Mar 5, 2018
faeec67
Removing glib references in ds3_uint64_string_map.h
RachelTucker Mar 6, 2018
da83a81
Making some internal utils static
RachelTucker Mar 6, 2018
e9d5664
Merge pull request #218 from RachelTucker/4_1_autogen
rpmoore Mar 6, 2018
3d9b1f0
Removing ChunkClientProcessingOrderGuarantee from request payload body
RachelTucker Mar 6, 2018
732279f
Merge pull request #220 from RachelTucker/csdk-171-4-1-api
rpmoore Mar 6, 2018
956a48c
Merging 4.1 and 5.0
RachelTucker Mar 22, 2018
1d6ee46
Updating to latest 5.0 API
RachelTucker Mar 22, 2018
921d893
Added ids request payload struct
RachelTucker Mar 26, 2018
f9473fc
Updated suspect blob commands to have request payload of ids
RachelTucker Mar 26, 2018
34eac6b
Putting library export definition in separate file
RachelTucker Mar 27, 2018
94df3ec
Fixing copyright
RachelTucker Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ add_library(ds3 SHARED
ds3_string_multimap.h ds3_string_multimap.c
ds3_string.h ds3_string.c
ds3_utils.h ds3_utils.c
ds3_connection.h ds3_connection.c)
ds3_connection.h ds3_connection.c
ds3_uint64_string_map.h ds3_uint64_string_map.c
ds3_response_header_utils.h ds3_response_header_utils.c
ds3_bool.h
ds3_library_exports.h)

if (WIN32)
set(CMAKE_BUILD_TYPE Release)
Expand Down Expand Up @@ -81,6 +85,10 @@ else(WIN32)
"ds3_string_multimap.h"
"ds3_string_multimap_impl.h"
"ds3_utils.h"
"ds3_uint64_string_map.h"
"ds3_response_header_utils.h"
"ds3_bool.h"
"ds3_library_exports.h"
DESTINATION
"/usr/local/include")
install(TARGETS ds3 DESTINATION lib)
Expand Down
39 changes: 33 additions & 6 deletions src/ds3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "ds3_connection.h"
#include "ds3_request.h"
#include "ds3_string_multimap_impl.h"
#include "ds3_uint64_string_map.h"
#include "ds3_utils.h"

#ifdef _WIN32
Expand Down Expand Up @@ -360,7 +361,7 @@ ds3_bulk_object_list_response* ds3_convert_object_list(const ds3_contents_respon
for (object_index = 0; object_index < num_objects; object_index++) {
ds3_bulk_object_response* response = g_new0(ds3_bulk_object_response, 1);
response->name = ds3_str_dup(objects[object_index]->key);
response->version = ds3_str_dup(objects[object_index]->version_id);
response->version_id = ds3_str_dup(objects[object_index]->version_id);

g_ptr_array_add(ds3_bulk_object_response_array, response);
}
Expand Down Expand Up @@ -448,6 +449,36 @@ void ds3_delete_objects_response_free(ds3_delete_objects_response* response) {
g_free(response);
}

void ds3_ids_list_free(ds3_ids_list* ids) {
if (ids == NULL) {
return;
}

int index;
for (index = 0; index < ids->num_strings; index++) {
ds3_str_free(ids->strings_list[index]);
}
g_free(ids->strings_list);
g_free(ids);
}

void ds3_head_object_response_free(ds3_head_object_response* response) {
if (response == NULL) {
return;
}
if (response->blob_checksum_type != NULL) {
g_free(response->blob_checksum_type);
}
if (response->metadata != NULL) {
ds3_metadata_free(response->metadata);
}
if (response->blob_checksums != NULL) {
ds3_uint64_string_map_free(response->blob_checksums);
}

g_free(response);
}

void ds3_paging_free(ds3_paging* paging) {
g_free(paging);
}
Expand Down Expand Up @@ -741,7 +772,6 @@ void ds3_s3_object_response_free(ds3_s3_object_response* response) {
ds3_str_free(response->creation_date);
ds3_str_free(response->id);
ds3_str_free(response->name);
ds3_str_free(response->version);

g_free(response);
}
Expand Down Expand Up @@ -1088,7 +1118,6 @@ void ds3_suspect_blob_pool_response_free(ds3_suspect_blob_pool_response* respons
ds3_str_free(response->date_written);
ds3_str_free(response->id);
ds3_str_free(response->last_accessed);
ds3_str_free(response->obsoletion_id);
ds3_str_free(response->pool_id);

g_free(response);
Expand All @@ -1100,7 +1129,6 @@ void ds3_suspect_blob_tape_response_free(ds3_suspect_blob_tape_response* respons

ds3_str_free(response->blob_id);
ds3_str_free(response->id);
ds3_str_free(response->obsoletion_id);
ds3_str_free(response->tape_id);

g_free(response);
Expand Down Expand Up @@ -2756,7 +2784,7 @@ void ds3_bulk_object_response_free(ds3_bulk_object_response* response) {
ds3_str_free(response->id);
ds3_str_free(response->name);
ds3_physical_placement_response_free(response->physical_placement);
ds3_str_free(response->version);
ds3_str_free(response->version_id);

g_free(response);
}
Expand Down Expand Up @@ -3000,7 +3028,6 @@ void ds3_detailed_s3_object_response_free(ds3_detailed_s3_object_response* respo
ds3_str_free(response->id);
ds3_str_free(response->name);
ds3_str_free(response->owner);
ds3_str_free(response->version);

g_free(response);
}
Expand Down
Loading