Skip to content

Commit 2c20d04

Browse files
authored
Merge pull request #210 from DenverM80/4_0_1_update
Regenerate from API contract for 4.0.1
2 parents c8b0b28 + c7d36c4 commit 2c20d04

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed

src/ds3.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,8 @@ typedef enum {
310310
DS3_TAPE_DRIVE_TYPE_LTO7,
311311
DS3_TAPE_DRIVE_TYPE_LTO8,
312312
DS3_TAPE_DRIVE_TYPE_TS1140,
313-
DS3_TAPE_DRIVE_TYPE_TS1150
313+
DS3_TAPE_DRIVE_TYPE_TS1150,
314+
DS3_TAPE_DRIVE_TYPE_TS1155
314315
}ds3_tape_drive_type;
315316
typedef enum {
316317
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_
24212422
LIBRARY_API void ds3_request_set_full_details(const ds3_request* request, ds3_bool value);
24222423
LIBRARY_API void ds3_request_set_full_of_data(const ds3_request* request, ds3_bool value);
24232424
LIBRARY_API void ds3_request_set_group_id(const ds3_request* request, const char * const value);
2425+
LIBRARY_API void ds3_request_set_guid(const ds3_request* request, const char * const value);
24242426
LIBRARY_API void ds3_request_set_health_ds3_pool_health(const ds3_request* request, const ds3_pool_health value);
24252427
LIBRARY_API void ds3_request_set_https(const ds3_request* request, ds3_bool value);
24262428
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,
40164018
*
40174019
* void ds3_request_set_assigned_to_storage_domain(const ds3_request* request, ds3_bool value)
40184020
* void ds3_request_set_bucket_id(const ds3_request* request, const char * const value)
4021+
* void ds3_request_set_guid(const ds3_request* request, const char * const value)
40194022
* void ds3_request_set_health_ds3_pool_health(const ds3_request* request, const ds3_pool_health value)
40204023
* void ds3_request_set_last_page(const ds3_request* request, ds3_bool value)
40214024
* void ds3_request_set_last_verified(const ds3_request* request, const char * const value)

src/ds3_init_requests.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
#include <inttypes.h>
3636
#endif
3737

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

4042
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) {
540542
return "TS1140";
541543
} else if (input == DS3_TAPE_DRIVE_TYPE_TS1150) {
542544
return "TS1150";
545+
} else if (input == DS3_TAPE_DRIVE_TYPE_TS1155) {
546+
return "TS1155";
543547
} else {
544548
return "";
545549
}
@@ -1144,6 +1148,10 @@ void ds3_request_set_full_of_data(const ds3_request* request, ds3_bool value) {
11441148
void ds3_request_set_group_id(const ds3_request* request, const char * const value) {
11451149
_set_query_param(request, "group_id", value);
11461150

1151+
}
1152+
void ds3_request_set_guid(const ds3_request* request, const char * const value) {
1153+
_set_query_param(request, "guid", value);
1154+
11471155
}
11481156
void ds3_request_set_health_ds3_pool_health(const ds3_request* request, const ds3_pool_health value) {
11491157
_set_query_param(request, "health", (const char*)_get_ds3_pool_health_str(value));

src/ds3_requests.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -970,6 +970,8 @@ static ds3_tape_drive_type _match_ds3_tape_drive_type(const ds3_log* log, const
970970
return DS3_TAPE_DRIVE_TYPE_TS1140;
971971
} else if (xmlStrcmp(text, (const xmlChar*) "TS1150") == 0) {
972972
return DS3_TAPE_DRIVE_TYPE_TS1150;
973+
} else if (xmlStrcmp(text, (const xmlChar*) "TS1155") == 0) {
974+
return DS3_TAPE_DRIVE_TYPE_TS1155;
973975
} else {
974976
ds3_log_message(log, DS3_ERROR, "ERROR: Unknown value of '%s'. Returning DS3_TAPE_DRIVE_TYPE_UNKNOWN for safety.", text);
975977
return DS3_TAPE_DRIVE_TYPE_UNKNOWN;

0 commit comments

Comments
 (0)