diff options
| -rw-r--r-- | src/util/Makefile.sources | 1 | ||||
| -rw-r--r-- | src/util/strndup.c | 47 | ||||
| -rw-r--r-- | src/util/strndup.h | 22 |
3 files changed, 20 insertions, 50 deletions
diff --git a/src/util/Makefile.sources b/src/util/Makefile.sources index e6c1c7690f1..5c123582b77 100644 --- a/src/util/Makefile.sources +++ b/src/util/Makefile.sources @@ -37,7 +37,6 @@ MESA_UTIL_FILES := \ slab.h \ string_to_uint_map.h \ string_to_uint_map.cpp \ - strndup.c \ strndup.h \ strtod.c \ strtod.h \ diff --git a/src/util/strndup.c b/src/util/strndup.c deleted file mode 100644 index 5ceb32fe474..00000000000 --- a/src/util/strndup.c +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (c) 2015 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#if defined(_WIN32) -#include <stdlib.h> -#include <string.h> -#include "strndup.h" - -char * -strndup(const char *str, size_t max) -{ - size_t n; - char *ptr; - - if (!str) - return NULL; - - n = strnlen(str, max); - ptr = (char *) calloc(n + 1, sizeof(char)); - if (!ptr) - return NULL; - - memcpy(ptr, str, n); - return ptr; -} - -#endif diff --git a/src/util/strndup.h b/src/util/strndup.h index a3d73984132..6d1868370fd 100644 --- a/src/util/strndup.h +++ b/src/util/strndup.h @@ -28,16 +28,34 @@ #if defined(_WIN32) +#include <string.h> + #ifdef __cplusplus extern "C" { #endif -char *strndup(const char *str, size_t max); +static inline char * +strndup(const char *str, size_t max) +{ + size_t n; + char *ptr; + + if (!str) + return NULL; + + n = strnlen(str, max); + ptr = (char *) calloc(n + 1, sizeof(char)); + if (!ptr) + return NULL; + + memcpy(ptr, str, n); + return ptr; +} #ifdef __cplusplus } #endif -#endif +#endif /* _WIN32 */ #endif /* STRNDUP_H */ |