fix get_objects_request passing of user_data and callback

Author: DenverM80

src/ds3.c

@@ -13375,55 +13375,6 @@ static ds3_error* _parse_top_level_ds3_list_multi_part_uploads_result_response(c
     return error;
 }
 
-ds3_error* ds3_head_bucket_request(const ds3_client* client, const ds3_request* request) {
-    if (client == NULL || request == NULL) {
-        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "All arguments must be filled in for request processing");
-    }
-    if (g_ascii_strncasecmp(request->path->value, "//", 2) == 0) {
-        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The bucket name parameter is required.");
-    }
-
-    return _internal_request_dispatcher(client, request, NULL, NULL, NULL, NULL, NULL);
-}
-
-ds3_error* ds3_head_object_request(const ds3_client* client, const ds3_request* request, ds3_metadata** _metadata) {
-    ds3_error* error;
-    ds3_string_multimap* return_headers;
-    ds3_metadata* metadata;
-
-    int num_slashes = num_chars_in_ds3_str(request->path, '/');
-    if (num_slashes < 2 || ((num_slashes == 2) && ('/' == request->path->value[request->path->size-1]))) {
-        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The object name parameter is required.");
-    } else if (g_ascii_strncasecmp(request->path->value, "//", 2) == 0) {
-        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The bucket name parameter is required.");
-    }
-
-    error = _internal_request_dispatcher(client, request, NULL, NULL, NULL, NULL, &return_headers);
-
-    if (error == NULL) {
-        metadata = _init_metadata(return_headers);
-        *_metadata = metadata;
-        ds3_string_multimap_free(return_headers);
-    }
-
-    return error;
-}
-
-
-ds3_error* ds3_get_object_with_metadata(const ds3_client* client, const ds3_request* request, void* user_data, size_t (* callback)(void*, size_t, size_t, void*), ds3_metadata** _metadata) {
-    ds3_error* error;
-    ds3_string_multimap* return_headers;
-    ds3_metadata* metadata;
-
-    error = _internal_request_dispatcher(client, request, user_data, callback, NULL, NULL, &return_headers);
-    if (error == NULL) {
-        metadata = _init_metadata(return_headers);
-        *_metadata = metadata;
-        ds3_string_multimap_free(return_headers);
-    }
-
-    return error;
-}
 
 ds3_error* ds3_abort_multi_part_upload_request(const ds3_client* client, const ds3_request* request) {
 
@@ -13570,7 +13521,26 @@ ds3_error* ds3_get_service_request(const ds3_client* client, const ds3_request*
 
     return _parse_top_level_ds3_list_all_my_buckets_result_response(client, request, response, xml_blob);
 }
-ds3_error* ds3_get_object_request(const ds3_client* client, const ds3_request* request, void* user_data, size_t (*callback)(void*, size_t, size_t, void*)) {
+
+ds3_error* ds3_get_object_request(const ds3_client* client, const ds3_request* request, void* user_data, size_t (* callback)(void*, size_t, size_t, void*)) {
+    ds3_error* error;
+
+    int num_slashes = num_chars_in_ds3_str(request->path, '/');
+    if (num_slashes < 2 || ((num_slashes == 2) && ('/' == request->path->value[request->path->size-1]))) {
+        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The bucket name parameter is required.");
+    } else if (g_ascii_strncasecmp(request->path->value, "//", 2) == 0) {
+        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The object name parameter is required.");
+    }
+
+    error = _internal_request_dispatcher(client, request, user_data, callback, NULL, NULL, NULL);
+
+    return error;
+}
+
+ds3_error* ds3_get_object_with_metadata(const ds3_client* client, const ds3_request* request, void* user_data, size_t (* callback)(void*, size_t, size_t, void*), ds3_metadata** _metadata) {
+    ds3_error* error;
+    ds3_string_multimap* return_headers;
+    ds3_metadata* metadata;
 
     int num_slashes = num_chars_in_ds3_str(request->path, '/');
     if (num_slashes < 2 || ((num_slashes == 2) && ('/' == request->path->value[request->path->size-1]))) {
@@ -13579,8 +13549,49 @@ ds3_error* ds3_get_object_request(const ds3_client* client, const ds3_request* r
         return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The object name parameter is required.");
     }
 
+    error = _internal_request_dispatcher(client, request, user_data, callback, NULL, NULL, &return_headers);
+    if (error == NULL) {
+        metadata = _init_metadata(return_headers);
+        *_metadata = metadata;
+        ds3_string_multimap_free(return_headers);
+    }
+
+    return error;
+}
+ds3_error* ds3_head_bucket_request(const ds3_client* client, const ds3_request* request) {
+    if (client == NULL || request == NULL) {
+        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "All arguments must be filled in for request processing");
+    }
+    if (g_ascii_strncasecmp(request->path->value, "//", 2) == 0) {
+        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The bucket name parameter is required.");
+    }
+
     return _internal_request_dispatcher(client, request, NULL, NULL, NULL, NULL, NULL);
 }
+
+ds3_error* ds3_head_object_request(const ds3_client* client, const ds3_request* request, ds3_metadata** _metadata) {
+    ds3_error* error;
+    ds3_string_multimap* return_headers;
+    ds3_metadata* metadata;
+
+    int num_slashes = num_chars_in_ds3_str(request->path, '/');
+    if (num_slashes < 2 || ((num_slashes == 2) && ('/' == request->path->value[request->path->size-1]))) {
+        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The object name parameter is required.");
+    } else if (g_ascii_strncasecmp(request->path->value, "//", 2) == 0) {
+        return ds3_create_error(DS3_ERROR_MISSING_ARGS, "The bucket name parameter is required.");
+    }
+
+    error = _internal_request_dispatcher(client, request, NULL, NULL, NULL, NULL, &return_headers);
+
+    if (error == NULL) {
+        metadata = _init_metadata(return_headers);
+        *_metadata = metadata;
+        ds3_string_multimap_free(return_headers);
+    }
+
+    return error;
+}
+
 ds3_error* ds3_initiate_multi_part_upload_request(const ds3_client* client, const ds3_request* request, ds3_initiate_multipart_upload_result_response** response) {
     ds3_error* error;
     GByteArray* xml_blob;