X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.c;h=928a0368668ce06bd4a3236018c707148ffe4068;hb=a8d148d9b2a765ba7fcbce927ea2546f917afe53;hp=f22d451e6e8f4b4fd08c5a023dbaecb90ea62017;hpb=f0b5b16920d4478d053e48db08014e5d57f11263;p=wimlib diff --git a/src/util.c b/src/util.c index f22d451e..928a0368 100644 --- a/src/util.c +++ b/src/util.c @@ -28,6 +28,7 @@ #include #include #ifdef HAVE_SYS_SYSCTL_H +# include # include #endif #include @@ -90,28 +91,14 @@ wimlib_calloc(size_t nmemb, size_t size) char * wimlib_strdup(const char *str) { - size_t size; - char *p; - - size = strlen(str); - p = MALLOC(size + 1); - if (p) - p = memcpy(p, str, size + 1); - return p; + return memdup(str, strlen(str) + 1); } #ifdef __WIN32__ wchar_t * wimlib_wcsdup(const wchar_t *str) { - size_t size; - wchar_t *p; - - size = wcslen(str); - p = MALLOC((size + 1) * sizeof(wchar_t)); - if (p) - p = wmemcpy(p, str, size + 1); - return p; + return memdup(str, (wcslen(str) + 1) * sizeof(wchar_t)); } #endif