Merge pull request #336 from lplewa/crt

add _CRT_SECURE_NO_WARNINGS definition

Author: igchor

CMakeLists.txt

@@ -117,6 +117,7 @@ install(
 if(WINDOWS)
     # set PATH to DLLs on Windows
     set(DLL_PATH_LIST "PATH=path_list_append:../bin/$<CONFIG>")
+    add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()
 
 if(UMF_BUILD_OS_MEMORY_PROVIDER AND (LINUX OR WINDOWS))

examples/basic/basic.c

@@ -13,8 +13,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "utils_common.h"
-
 int main(void) {
     // A result object for storing UMF API result status
     umf_result_t res;
@@ -51,7 +49,7 @@ int main(void) {
 
     // Write to the allocated memory
     memset(ptr_provider, '\0', alloc_size);
-    util_strncpy(ptr_provider, alloc_size, strSource, strlen(strSource) + 1);
+    strncpy(ptr_provider, strSource, alloc_size);
     printf("%s %p with the memory provider at %p\n", (char *)ptr_provider,
            (void *)ptr_provider, (void *)provider);
 
@@ -87,7 +85,7 @@ int main(void) {
     }
 
     // Write a string to allocated memory
-    util_strncpy(ptr, alloc_size, strSource, strlen(strSource) + 1);
+    strncpy(ptr, strSource, alloc_size);
     printf("%s %p\n", ptr, (void *)ptr);
 
     // Retrieve a memory pool from a pointer, available with memory tracking

src/utils/utils_common.h

@@ -66,8 +66,6 @@ int util_is_running_in_proxy_lib(void);
 
 size_t util_get_page_size(void);
 
-char *util_strncpy(char *dest, size_t destSize, const char *src, size_t n);
-
 // align a pointer and a size
 void util_align_ptr_size(void **ptr, size_t *size, size_t alignment);
 

src/utils/utils_posix_common.c

@@ -50,8 +50,3 @@ size_t util_get_page_size(void) {
     util_init_once(&Page_size_is_initialized, _util_get_page_size);
     return Page_size;
 }
-
-char *util_strncpy(char *dest, size_t destSize, const char *src, size_t n) {
-    (void)destSize; // unused
-    return strncpy(dest, src, n);
-}

src/utils/utils_windows_common.c

@@ -46,11 +46,3 @@ size_t util_get_page_size(void) {
     util_init_once(&Page_size_is_initialized, _util_get_page_size);
     return Page_size;
 }
-
-char *util_strncpy(char *dest, size_t destSize, const char *src, size_t n) {
-    if (strncpy_s(dest, destSize, src, n)) {
-        return NULL;
-    }
-
-    return dest;
-}