Merge pull request #69 from chanchett/master

changed object_type to ds3_object_type, changed NO_TYPE value to FOLDER

Author: rpmoore

src/ds3.c

@@ -475,10 +475,10 @@ static char* _net_get_verb(http_verb verb) {
     return NULL;
 }
 
-static char* _get_object_type(const object_type type) {
+static char* _get_ds3_object_type(const ds3_object_type type) {
     switch(type) {
         case DATA: return "DATA";
-        case NO_TYPE: return NULL;
+        case FOLDER: return "FOLDER";
     }
 
     return NULL;
@@ -1063,8 +1063,8 @@ void ds3_request_set_id(ds3_request* _request, const char* id) {
     _set_query_param(_request, "id", id);
 }
 
-void ds3_request_set_type(ds3_request* _request, object_type type) {
-    const char* type_as_string = _get_object_type(type);
+void ds3_request_set_type(ds3_request* _request, ds3_object_type type) {
+    const char* type_as_string = _get_ds3_object_type(type);
     if(type_as_string != NULL) {
         _set_query_param(_request, "type", type_as_string);
     }

src/ds3.h

@@ -119,8 +119,8 @@ typedef enum {
 }ds3_tape_type;
 
 typedef enum {
-  DATA, NO_TYPE
-}object_type;
+  DATA, FOLDER
+}ds3_object_type;
 
 LIBRARY_API ds3_str* ds3_str_init(const char* string);
 LIBRARY_API ds3_str* ds3_str_init_with_size(const char* string, size_t size);
@@ -397,7 +397,7 @@ LIBRARY_API void ds3_request_set_md5(ds3_request* request, const char* md5);
 LIBRARY_API void ds3_request_set_metadata(ds3_request* request, const char* name, const char* value);
 LIBRARY_API void ds3_request_set_name(ds3_request* request, const char* name);
 LIBRARY_API void ds3_request_set_id(ds3_request* request, const char* id);
-LIBRARY_API void ds3_request_set_type(ds3_request* request, object_type type);
+LIBRARY_API void ds3_request_set_type(ds3_request* request, ds3_object_type type);
 LIBRARY_API void ds3_request_set_version(ds3_request* request, const char* version);
 
 LIBRARY_API ds3_error* ds3_get_system_information(const ds3_client* client, const ds3_request* request, ds3_get_system_information_response** response);