Merge pull request #12 from robertgrimm/master

Change s3_request_set_max_key's max_keys argument and fix a few format warnings

Author: rpmoore

src/ds3.c

@@ -461,7 +461,7 @@ static ds3_error* _net_process_request(const ds3_client* client, const ds3_reque
             return error;
         }
 
-        fprintf(stderr, "Got status code of (%ld) expected (%ld)\n", response_data.status_code, request->expected_status_code);
+        fprintf(stderr, "Got status code of (%llu) expected (%llu)\n", response_data.status_code, request->expected_status_code);
         if(request->expected_status_code != response_data.status_code) {
             ds3_error* error = _ds3_create_error(DS3_ERROR_BAD_STATUS_CODE, "Got an unexpected status code.");
             error->error = g_new0(ds3_error_response, 1);
@@ -551,8 +551,11 @@ void ds3_request_set_marker(ds3_request* _request, const char* marker) {
     _set_query_param(_request, "marker", marker);
 }
 
-void ds3_request_set_max_keys(ds3_request* _request, const char* max_keys) {
-    _set_query_param(_request, "max-keys", max_keys);
+void ds3_request_set_max_keys(ds3_request* _request, uint32_t max_keys) {
+    char max_keys_s[11];
+    memset(max_keys_s, 0, sizeof(char) * 11);
+    g_snprintf(max_keys_s, sizeof(char) * 11, "%u", max_keys);
+    _set_query_param(_request, "max-keys", max_keys_s);
 }
 
 static struct _ds3_request* _common_request_init(void){
@@ -1226,7 +1229,7 @@ static xmlDocPtr _generate_xml_objects_list(const ds3_bulk_object_list* obj_list
         memset(size_buff, 0, sizeof(char) * 21);
 
         obj = obj_list->list[i];
-        g_snprintf(size_buff, sizeof(char) * 21, "%ld", obj.length);
+        g_snprintf(size_buff, sizeof(char) * 21, "%llu", obj.length);
 
         object_node = xmlNewNode(NULL, (xmlChar*) "Object");
         xmlAddChild(objects_node, object_node);

src/ds3.h

@@ -195,7 +195,7 @@ LIBRARY_API void ds3_client_proxy(ds3_client* client, const char* proxy);
 LIBRARY_API void ds3_request_set_prefix(ds3_request* request, const char* prefix);
 LIBRARY_API void ds3_request_set_delimiter(ds3_request* request, const char* delimiter);
 LIBRARY_API void ds3_request_set_marker(ds3_request* request, const char* marker);
-LIBRARY_API void ds3_request_set_max_keys(ds3_request* request, const char* max_keys);
+LIBRARY_API void ds3_request_set_max_keys(ds3_request* request, uint32_t max_keys);
 
 LIBRARY_API ds3_error* ds3_get_service(const ds3_client* client, const ds3_request* request, ds3_get_service_response** response);
 LIBRARY_API ds3_error* ds3_get_bucket(const ds3_client* client, const ds3_request* request, ds3_get_bucket_response** response);