util: Fixes gcc warning: declaration of 'strndup' shadows a built-in function [-Wshadow]

../../src/util/strndup.h:37:1: warning: declaration of 'strndup' shadows a built-in function [-Wshadow]
   37 | strndup(const char *str, size_t max)
      | ^~~~~~~

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37289>
This commit is contained in:
Yonggang Luo 2025-09-10 22:27:02 +08:00 committed by Marge Bot
parent a01a110071
commit bd915eeb96
3 changed files with 31 additions and 36 deletions

View file

@ -120,6 +120,7 @@ files_mesa_util = files(
'sparse_array.h',
'string_buffer.c',
'string_buffer.h',
'strndup.c',
'strndup.h',
'strtod.c',
'strtod.h',

27
src/util/strndup.c Normal file
View file

@ -0,0 +1,27 @@
/*
* Copyright (c) 2015 Intel Corporation
* Copyright (c) 2025 Yonggang Luo
* SPDX-License-Identifier: MIT
*/
#include "strndup.h"
#if defined(_WIN32)
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

View file

@ -1,24 +1,6 @@
/*
* 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.
* SPDX-License-Identifier: MIT
*/
#ifndef STRNDUP_H
@ -33,23 +15,8 @@
extern "C" {
#endif
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;
}
char *
strndup(const char *str, size_t max);
#ifdef __cplusplus
}