Fix some base64/32 related files. (#308)

build_all/mbed/azure_c_shared_utility_filelist.txt

@@ -1,6 +1,6 @@
 set(mbed_exported_project_files
         ${CMAKE_CURRENT_SOURCE_DIR}/../../inc/azure_c_shared_utility/agenttime.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../inc/azure_c_shared_utility/base64.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../inc/azure_c_shared_utility/azure_base64.h
         ${CMAKE_CURRENT_SOURCE_DIR}/../../inc/azure_c_shared_utility/buffer_.h
         ${CMAKE_CURRENT_SOURCE_DIR}/../../inc/azure_c_shared_utility/connection_string_parser.h
         ${CMAKE_CURRENT_SOURCE_DIR}/../../inc/azure_c_shared_utility/condition.h
@@ -54,7 +54,7 @@ set(mbed_exported_project_files
    )
 
 set(mbed_project_files
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/base64.c
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/azure_base64.c
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/buffer.c
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/constbuffer.c
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/connection_string_parser.c

build_all/mbed3/shared-util_filelist.txt

@@ -1,5 +1,5 @@
 inc\agenttime.h
-inc\base64.h
+inc\azure_base64.h
 inc\buffer_.h
 inc\condition.h
 inc\constbuffer.h
@@ -40,7 +40,7 @@ inc\xio.h
 inc\xlogging.h
 inc\vector_types.h
 inc\vector_types_internal.h
-src\base64.c
+src\azure_base64.c
 src\buffer.c
 src\constbuffer.c
 src\consolelogger.c

build_all/tirtos/package.bld

@@ -13,7 +13,7 @@ Pkg.generatedFiles.$add("lib/");
 
 var SRCS = [
     "agenttime.c", 
-    "base64.c",
+    "azure_base64.c",
     "buffer.c",
     "consolelogger.c",
 	"constbuffer.c",

inc/azure_c_shared_utility/azure_base64.h

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-/** @file base64.h
+/** @file azure_base64.h
 *    @brief Prototypes for functions related to encoding/decoding
 *    a @c buffer using standard base64 encoding.
 */

tests/CMakeLists.txt

@@ -8,7 +8,7 @@ set(SHARED_UTIL_REAL_TEST_FOLDER ${CMAKE_CURRENT_LIST_DIR}/real_test_files CACHE
 
 if(${run_unittests})
     add_subdirectory(agenttime_ut)
-    add_subdirectory(base32_ut)
+    add_subdirectory(azure_base32_ut)
     add_subdirectory(azure_base64_ut)
     add_subdirectory(buffer_ut)
     add_subdirectory(constbuffer_array_ut)

tests/azure_base32_ut/CMakeLists.txt

@@ -3,7 +3,7 @@
 
 cmake_minimum_required(VERSION 2.8.11)
 
-set(theseTestsName base32_ut)
+set(theseTestsName azure_base32_ut)
 
 set(${theseTestsName}_test_files
     ${theseTestsName}.c

tests/azure_base32_ut/azure_base32_ut.c

@@ -142,7 +142,7 @@ static void my_STRING_delete(STRING_HANDLE h)
     my_gballoc_free((void*)h);
 }
 
-BEGIN_TEST_SUITE(base32_ut)
+BEGIN_TEST_SUITE(azure_base32_ut)
 
     TEST_SUITE_INITIALIZE(suite_init)
     {
@@ -507,4 +507,4 @@ BEGIN_TEST_SUITE(base32_ut)
         STRING_delete(input);
     }
 
-END_TEST_SUITE(base32_ut)
+END_TEST_SUITE(azure_base32_ut)

tests/azure_base32_ut/main.c

@@ -6,6 +6,6 @@
 int main(void)
 {
     size_t failedTestCount = 0;
-    RUN_TEST_SUITE(base32_ut, failedTestCount);
+    RUN_TEST_SUITE(azure_base32_ut, failedTestCount);
     return failedTestCount;
 }

tests/real_test_files/real_base64.c

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-#define Base64_Encoder real_Base64_Encoder
+#define Azure_Base64_Encode real_Azure_Base64_Encode
 #define Azure_Base64_Encode_Bytes real_Base64_Encode_Bytes
-#define Azure_Base64_Decoder real_Azure_Base64_Decoder
+#define Azure_Base64_Decode real_Azure_Base64_Decode
 
 #define GBALLOC_H
 
-#include "base64.c"
+#include "azure_base64.c"