Skip to content

Commit 3506d70

Browse files
authored
Merge pull request #222 from RachelTucker/remove-serial-id
Updating API: Removing deprecated serial id
2 parents 3d836ba + b4f3a21 commit 3506d70

File tree

3 files changed

+1
-14
lines changed

3 files changed

+1
-14
lines changed

src/ds3.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,7 +1218,6 @@ void ds3_tape_partition_response_free(ds3_tape_partition_response* response) {
12181218
ds3_str_free(response->id);
12191219
ds3_str_free(response->library_id);
12201220
ds3_str_free(response->name);
1221-
ds3_str_free(response->serial_id);
12221221
ds3_str_free(response->serial_number);
12231222

12241223
g_free(response);
@@ -1680,7 +1679,6 @@ void ds3_detailed_tape_partition_response_free(ds3_detailed_tape_partition_respo
16801679
ds3_str_free(response->id);
16811680
ds3_str_free(response->library_id);
16821681
ds3_str_free(response->name);
1683-
ds3_str_free(response->serial_id);
16841682
ds3_str_free(response->serial_number);
16851683
for (index = 0; index < response->num_tape_types; index++) {
16861684
ds3_str_free(response->tape_types[index]);
@@ -1781,7 +1779,6 @@ void ds3_named_detailed_tape_partition_response_free(ds3_named_detailed_tape_par
17811779
ds3_str_free(response->id);
17821780
ds3_str_free(response->library_id);
17831781
ds3_str_free(response->name);
1784-
ds3_str_free(response->serial_id);
17851782
ds3_str_free(response->serial_number);
17861783
for (index = 0; index < response->num_tape_types; index++) {
17871784
ds3_str_free(response->tape_types[index]);

src/ds3.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1239,7 +1239,6 @@ typedef struct {
12391239
int minimum_write_reserved_drives;
12401240
ds3_str* name;
12411241
ds3_quiesced quiesced;
1242-
ds3_str* serial_id;
12431242
ds3_str* serial_number;
12441243
ds3_tape_partition_state state;
12451244
}ds3_tape_partition_response;
@@ -1516,7 +1515,6 @@ typedef struct {
15161515
int minimum_write_reserved_drives;
15171516
ds3_str* name;
15181517
ds3_quiesced quiesced;
1519-
ds3_str* serial_id;
15201518
ds3_str* serial_number;
15211519
ds3_tape_partition_state state;
15221520
ds3_str** tape_types;
@@ -1577,7 +1575,6 @@ typedef struct {
15771575
int minimum_write_reserved_drives;
15781576
ds3_str* name;
15791577
ds3_quiesced quiesced;
1580-
ds3_str* serial_id;
15811578
ds3_str* serial_number;
15821579
ds3_tape_partition_state state;
15831580
ds3_str** tape_types;
@@ -4588,6 +4585,7 @@ LIBRARY_API ds3_error* ds3_modify_tape_drive_spectra_s3_request(const ds3_client
45884585
* void ds3_request_set_minimum_read_reserved_drives(const ds3_request* request, const int value)
45894586
* void ds3_request_set_minimum_write_reserved_drives(const ds3_request* request, const int value)
45904587
* void ds3_request_set_quiesced_ds3_quiesced(const ds3_request* request, const ds3_quiesced value)
4588+
* void ds3_request_set_serial_number(const ds3_request* request, const char * const value)
45914589
*/
45924590
LIBRARY_API ds3_request* ds3_init_modify_tape_partition_spectra_s3_request(const char *const resource_id);
45934591
LIBRARY_API ds3_error* ds3_modify_tape_partition_spectra_s3_request(const ds3_client* client, const ds3_request* request, ds3_tape_partition_response** response);

src/ds3_requests.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4068,8 +4068,6 @@ static ds3_error* _parse_ds3_tape_partition_response(const ds3_client* client, c
40684068
}
40694069
response->quiesced = _match_ds3_quiesced(client->log, text);
40704070
xmlFree(text);
4071-
} else if (element_equal(child_node, "SerialId")) {
4072-
response->serial_id = xml_get_string(doc, child_node);
40734071
} else if (element_equal(child_node, "SerialNumber")) {
40744072
response->serial_number = xml_get_string(doc, child_node);
40754073
} else if (element_equal(child_node, "State")) {
@@ -5350,8 +5348,6 @@ static ds3_error* _parse_ds3_named_detailed_tape_partition_response(const ds3_cl
53505348
}
53515349
response->quiesced = _match_ds3_quiesced(client->log, text);
53525350
xmlFree(text);
5353-
} else if (element_equal(child_node, "SerialId")) {
5354-
response->serial_id = xml_get_string(doc, child_node);
53555351
} else if (element_equal(child_node, "SerialNumber")) {
53565352
response->serial_number = xml_get_string(doc, child_node);
53575353
} else if (element_equal(child_node, "State")) {
@@ -8795,8 +8791,6 @@ static ds3_error* _parse_top_level_ds3_tape_partition_response(const ds3_client*
87958791
}
87968792
response->quiesced = _match_ds3_quiesced(client->log, text);
87978793
xmlFree(text);
8798-
} else if (element_equal(child_node, "SerialId")) {
8799-
response->serial_id = xml_get_string(doc, child_node);
88008794
} else if (element_equal(child_node, "SerialNumber")) {
88018795
response->serial_number = xml_get_string(doc, child_node);
88028796
} else if (element_equal(child_node, "State")) {
@@ -9526,8 +9520,6 @@ static ds3_error* _parse_top_level_ds3_detailed_tape_partition_response(const ds
95269520
}
95279521
response->quiesced = _match_ds3_quiesced(client->log, text);
95289522
xmlFree(text);
9529-
} else if (element_equal(child_node, "SerialId")) {
9530-
response->serial_id = xml_get_string(doc, child_node);
95319523
} else if (element_equal(child_node, "SerialNumber")) {
95329524
response->serial_number = xml_get_string(doc, child_node);
95339525
} else if (element_equal(child_node, "State")) {

0 commit comments

Comments
 (0)