mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
drm/xe: switch to local xbasename() helper
Commitb0a2ee5567
("drm/xe: prepare xe_gen_wa_oob to be multi-use") introduced a call to basename(). The GNU version of this function is not portable and fails to build with alternative libc implementations like musl or bionic. This causes the following build error: drivers/gpu/drm/xe/xe_gen_wa_oob.c:130:12: error: assignment to ‘const char *’ from ‘int’ makes pointer from integer without a cast [-Wint-conversion] 130 | fn = basename(fn); | ^ While a POSIX version of basename() could be used, it would require a separate header plus the behavior differs from GNU version in that it might modify its argument. Not great. Instead, implement a local xbasename() helper based on strrchr() that provides the same functionality and avoids portability issues. Fixes:b0a2ee5567
("drm/xe: prepare xe_gen_wa_oob to be multi-use") Suggested-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Tiffany Yang <ynaffit@google.com> Signed-off-by: Carlos Llamas <cmllamas@google.com> Reviewed-by: Lucas De Marchi <lucas.demarchi@intel.com> Link: https://lore.kernel.org/r/20250825155743.1132433-1-cmllamas@google.com Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> (cherry picked from commit 41be792f5baaf90d744a9a9e82994ce560ca9582) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
This commit is contained in:
parent
16ca06aa2c
commit
75671d90fd
@ -123,11 +123,19 @@ static int parse(FILE *input, FILE *csource, FILE *cheader, char *prefix)
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Avoid GNU vs POSIX basename() discrepancy, just use our own */
|
||||
static const char *xbasename(const char *s)
|
||||
{
|
||||
const char *p = strrchr(s, '/');
|
||||
|
||||
return p ? p + 1 : s;
|
||||
}
|
||||
|
||||
static int fn_to_prefix(const char *fn, char *prefix, size_t size)
|
||||
{
|
||||
size_t len;
|
||||
|
||||
fn = basename(fn);
|
||||
fn = xbasename(fn);
|
||||
len = strlen(fn);
|
||||
|
||||
if (len > size - 1)
|
||||
|
Loading…
Reference in New Issue
Block a user