From c7d36c42f382eb27bd2ebfba85be76a6de18f48b Mon Sep 17 00:00:00 2001 From: DenverM80 Date: Mon, 25 Sep 2017 13:51:05 -0600 Subject: [PATCH] Regenerate from API contract for 4.0.1 --- src/ds3.h | 5 ++++- src/ds3_init_requests.c | 8 ++++++++ src/ds3_requests.c | 3 ++- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/ds3.h b/src/ds3.h index cbb0c4ef..bacab814 100644 --- a/src/ds3.h +++ b/src/ds3.h @@ -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, @@ -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); @@ -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) diff --git a/src/ds3_init_requests.c b/src/ds3_init_requests.c index eeb9bd89..0d7964fd 100644 --- a/src/ds3_init_requests.c +++ b/src/ds3_init_requests.c @@ -35,6 +35,8 @@ #include #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) { @@ -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 ""; } @@ -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)); diff --git a/src/ds3_requests.c b/src/ds3_requests.c index 6b4744ce..3d286101 100644 --- a/src/ds3_requests.c +++ b/src/ds3_requests.c @@ -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; } @@ -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;