Visual studio does not consider static const to be Constant; use #define instead

Author: DenverM80

src/ds3_init_requests.c

@@ -26,7 +26,7 @@
 #include "ds3_request.h"
 #include "ds3_net.h"
 
-static const unsigned int STRING_BUFFER_SIZE = 32;
+#define STRING_BUFFER_SIZE 32
 
 static char* _get_ds3_bucket_acl_permission_str(ds3_bucket_acl_permission input) {
     if (input == DS3_BUCKET_ACL_PERMISSION_LIST) {

src/ds3_requests.c

@@ -34,13 +34,9 @@
 #endif
 
 
-//The max size of an uint32_t should be 10 characters + NULL
-static const char UNSIGNED_LONG_BASE_10[] = "4294967296";
-static const unsigned int UNSIGNED_LONG_BASE_10_STR_LEN = sizeof(UNSIGNED_LONG_BASE_10) + 1;
-//The max size of an uint64_t should be 20 characters + NULL
-static const char UNSIGNED_LONG_LONG_BASE_10[] = "18446744073709551615";
-static const unsigned int UNSIGNED_LONG_LONG_BASE_10_STR_LEN = sizeof(UNSIGNED_LONG_LONG_BASE_10) + 1;
-
+//The max size of an uint32_t is 10 characters + NULL
+//The max size of an uint64_t is 20 characters + NULL
+#define STRING_BUFFER_SIZE 32
 
 
 struct _ds3_metadata {
@@ -408,7 +404,7 @@ static ds3_error* _get_request_xml_nodes(
 }
 
 static xmlDocPtr _generate_xml_bulk_objects_list(const ds3_bulk_object_list_response* obj_list, object_list_type list_type, ds3_job_chunk_client_processing_order_guarantee order) {
-    char size_buff[UNSIGNED_LONG_LONG_BASE_10_STR_LEN];
+    char size_buff[STRING_BUFFER_SIZE];
     xmlDocPtr doc;
     ds3_bulk_object_response* obj;
     xmlNodePtr objects_node, object_node;
@@ -431,7 +427,7 @@ static xmlDocPtr _generate_xml_bulk_objects_list(const ds3_bulk_object_list_resp
 
     for (obj_index = 0; obj_index < obj_list->num_objects; obj_index++) {
         obj = obj_list->objects[obj_index];
-        g_snprintf(size_buff, sizeof(char) * UNSIGNED_LONG_LONG_BASE_10_STR_LEN, "%" PRIu64, obj->length);
+        g_snprintf(size_buff, STRING_BUFFER_SIZE, "%" PRIu64, obj->length);
 
         object_node = xmlNewNode(NULL, (xmlChar*) "Object");
         xmlAddChild(objects_node, object_node);
@@ -448,7 +444,7 @@ static xmlDocPtr _generate_xml_bulk_objects_list(const ds3_bulk_object_list_resp
 }
 
 static xmlDocPtr _generate_xml_complete_mpu(const ds3_complete_multipart_upload_response* mpu_list) {
-    char size_buff[UNSIGNED_LONG_LONG_BASE_10_STR_LEN];
+    char size_buff[STRING_BUFFER_SIZE];
     xmlDocPtr doc;
     ds3_multipart_upload_part_response* part;
     xmlNodePtr parts_node, part_node;
@@ -464,7 +460,7 @@ static xmlDocPtr _generate_xml_complete_mpu(const ds3_complete_multipart_upload_
         part_node = xmlNewNode(NULL, (xmlChar*) "Part");
         xmlAddChild(parts_node, part_node);
 
-        g_snprintf(size_buff, sizeof(char) * UNSIGNED_LONG_LONG_BASE_10_STR_LEN, "%d", part->part_number);
+        g_snprintf(size_buff, STRING_BUFFER_SIZE, "%d", part->part_number);
         xmlNewTextChild(part_node, NULL, (xmlChar*) "PartNumber", (xmlChar*) size_buff);
 
         xmlNewTextChild(part_node, NULL, (xmlChar*) "ETag", (xmlChar*) part->etag->value);