Changed constant strings' type from * to [].

Prevent using sizeof to return unexpected value.
Azure · Feb 21, 2017 · f5cd2b4 · f5cd2b4
1 parent d7bf2a9
commit f5cd2b4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 2 deletions.
diff --git a/Microsoft.WindowsAzure.Storage/includes/wascore/constants.h b/Microsoft.WindowsAzure.Storage/includes/wascore/constants.h
@@ -62,7 +62,7 @@ namespace azure { namespace storage { namespace protocol {
     const int maximum_share_quota(5120);
 
 #define _CONSTANTS
-#define DAT(a, b) extern WASTORAGE_API const utility::char_t* a; const size_t a ## _size = sizeof(b) / sizeof(utility::char_t) - 1;
+#define DAT(a, b) WASTORAGE_API extern const utility::char_t a[]; const size_t a ## _size = sizeof(b) / sizeof(utility::char_t) - 1;
 #include "constants.dat"
 #undef DAT
 #undef _CONSTANTS

diff --git a/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h b/Microsoft.WindowsAzure.Storage/includes/wascore/executor.h
@@ -24,6 +24,7 @@
 #include "util.h"
 #include "streams.h"
 #include "was/auth.h"
+#include "wascore/constants.h"
 #include "wascore/resources.h"
 
 namespace azure { namespace storage { namespace core {

diff --git a/Microsoft.WindowsAzure.Storage/src/blob_response_parsers.cpp b/Microsoft.WindowsAzure.Storage/src/blob_response_parsers.cpp
@@ -17,6 +17,7 @@
 
 #include "stdafx.h"
 #include "wascore/protocol.h"
+#include "wascore/constants.h"
 
 namespace azure { namespace storage { namespace protocol {
 

diff --git a/Microsoft.WindowsAzure.Storage/src/constants.cpp b/Microsoft.WindowsAzure.Storage/src/constants.cpp
@@ -16,12 +16,13 @@
 // -----------------------------------------------------------------------------------------
 
 #include "stdafx.h"
+#include "wascore/constants.h"
 #include "wascore/basic_types.h"
 
 namespace azure { namespace storage { namespace protocol {
 
 #define _CONSTANTS
-#define DAT(a, b) WASTORAGE_API const utility::char_t* a = b;
+#define DAT(a, b) WASTORAGE_API const utility::char_t a[] = b;
 #include "wascore/constants.dat"
 #undef DAT
 #undef _CONSTANTS

diff --git a/Microsoft.WindowsAzure.Storage/src/file_response_parsers.cpp b/Microsoft.WindowsAzure.Storage/src/file_response_parsers.cpp
@@ -17,6 +17,7 @@
 
 #include "stdafx.h"
 #include "wascore/protocol.h"
+#include "wascore/constants.h"
 
 namespace azure { namespace storage { namespace protocol {
 

diff --git a/Microsoft.WindowsAzure.Storage/src/resources.cpp b/Microsoft.WindowsAzure.Storage/src/resources.cpp
@@ -16,6 +16,7 @@
 // -----------------------------------------------------------------------------------------
 
 #include "stdafx.h"
+#include "wascore/resources.h"
 #include "wascore/basic_types.h"
 
 namespace azure { namespace storage { namespace protocol {