Skip to content

Regenerate from API contract for 4.0.1 #210

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
merged 1 commit into from
Sep 25, 2017
Merged

Regenerate from API contract for 4.0.1 #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/ds3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ typedef enum {
DS3_TAPE_DRIVE_TYPE_LTO7,
DS3_TAPE_DRIVE_TYPE_LTO8,
DS3_TAPE_DRIVE_TYPE_TS1140,
DS3_TAPE_DRIVE_TYPE_TS1150
DS3_TAPE_DRIVE_TYPE_TS1150,
DS3_TAPE_DRIVE_TYPE_TS1155
}ds3_tape_drive_type;
typedef enum {
DS3_TAPE_FAILURE_TYPE_BAR_CODE_CHANGED,
Expand Down Expand Up @@ -2421,6 +2422,7 @@ LIBRARY_API void ds3_request_set_format_ds3_http_response_format_type(const ds3_
LIBRARY_API void ds3_request_set_full_details(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_full_of_data(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_group_id(const ds3_request* request, const char * const value);
LIBRARY_API void ds3_request_set_guid(const ds3_request* request, const char * const value);
LIBRARY_API void ds3_request_set_health_ds3_pool_health(const ds3_request* request, const ds3_pool_health value);
LIBRARY_API void ds3_request_set_https(const ds3_request* request, ds3_bool value);
LIBRARY_API void ds3_request_set_id(const ds3_request* request, const char * const value);
Expand Down Expand Up @@ -4016,6 +4018,7 @@ LIBRARY_API ds3_error* ds3_get_pool_spectra_s3_request(const ds3_client* client,
*
* void ds3_request_set_assigned_to_storage_domain(const ds3_request* request, ds3_bool value)
* void ds3_request_set_bucket_id(const ds3_request* request, const char * const value)
* void ds3_request_set_guid(const ds3_request* request, const char * const value)
* void ds3_request_set_health_ds3_pool_health(const ds3_request* request, const ds3_pool_health value)
* void ds3_request_set_last_page(const ds3_request* request, ds3_bool value)
* void ds3_request_set_last_verified(const ds3_request* request, const char * const value)
Expand Down
8 changes: 8 additions & 0 deletions src/ds3_init_requests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
#include <inttypes.h>
#endif

//The max size of an uint32_t is 10 characters + NULL
//The max size of an uint64_t is 20 characters + NULL
#define STRING_BUFFER_SIZE 32

static char* _get_ds3_bucket_acl_permission_str(ds3_bucket_acl_permission input) {
Expand Down Expand Up @@ -540,6 +542,8 @@ static char* _get_ds3_tape_drive_type_str(ds3_tape_drive_type input) {
return "TS1140";
} else if (input == DS3_TAPE_DRIVE_TYPE_TS1150) {
return "TS1150";
} else if (input == DS3_TAPE_DRIVE_TYPE_TS1155) {
return "TS1155";
} else {
return "";
}
Expand Down Expand Up @@ -1144,6 +1148,10 @@ void ds3_request_set_full_of_data(const ds3_request* request, ds3_bool value) {
void ds3_request_set_group_id(const ds3_request* request, const char * const value) {
_set_query_param(request, "group_id", value);

}
void ds3_request_set_guid(const ds3_request* request, const char * const value) {
_set_query_param(request, "guid", value);

}
void ds3_request_set_health_ds3_pool_health(const ds3_request* request, const ds3_pool_health value) {
_set_query_param(request, "health", (const char*)_get_ds3_pool_health_str(value));
Expand Down
3 changes: 2 additions & 1 deletion src/ds3_requests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ static ds3_metadata_entry* ds3_metadata_entry_init(ds3_string_multimap_entry* he
response->num_values = num_values;
response->name = key_name;
response->values = (ds3_str**) g_ptr_array_free(values, FALSE);
fprintf(stderr, "creating metadata entry of: %s\n", key_name->value);
return response;
}

Expand Down Expand Up @@ -971,6 +970,8 @@ static ds3_tape_drive_type _match_ds3_tape_drive_type(const ds3_log* log, const
return DS3_TAPE_DRIVE_TYPE_TS1140;
} else if (xmlStrcmp(text, (const xmlChar*) "TS1150") == 0) {
return DS3_TAPE_DRIVE_TYPE_TS1150;
} else if (xmlStrcmp(text, (const xmlChar*) "TS1155") == 0) {
return DS3_TAPE_DRIVE_TYPE_TS1155;
} else {
ds3_log_message(log, DS3_ERROR, "ERROR: Unknown value of '%s'. Returning DS3_TAPE_DRIVE_TYPE_UNKNOWN for safety.", text);
return DS3_TAPE_DRIVE_TYPE_UNKNOWN;
Expand Down