mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 09:32:12 +02:00
nfs-utils: Use v2 of upstream patch for tpyecast fix
(From OE-Core rev: a2c5b2cad7857250b4a1b36ba792a8110989733a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1,29 +1,32 @@
|
||||
From bbed752dfad73738baefe518e5959b5c0f038c75 Mon Sep 17 00:00:00 2001
|
||||
From 0a64c5ad17786796d84390e480a38b4f762229ae Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 18 Dec 2024 19:20:39 -0800
|
||||
Subject: [PATCH] Fix typecast warning with clang
|
||||
Subject: [PATCH v2] Fix typecast warning with clang
|
||||
|
||||
Fixes
|
||||
file.c:200:8: error: assigning to 'char *' from 'const char *' discards qualifiers [-Werror,-Wincompatible-pointer-types-discards-qualifiers]
|
||||
|
||||
Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=173457863307678&w=2]
|
||||
Upstream-Status: Submitted [https://marc.info/?l=linux-nfs&m=173463533411103&w=2]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
Cc: Benjamin Coddington <bcodding@redhat.com>
|
||||
Cc: Steve Dickson <steved@redhat.com>
|
||||
---
|
||||
support/nsm/file.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
v2: Make base as const char pointer insread of trying type punning
|
||||
|
||||
support/nsm/file.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/support/nsm/file.c b/support/nsm/file.c
|
||||
index de122b0..0fa6164 100644
|
||||
index de122b0f..68f99bf0 100644
|
||||
--- a/support/nsm/file.c
|
||||
+++ b/support/nsm/file.c
|
||||
@@ -197,7 +197,7 @@ nsm_make_temp_pathname(const char *pathname)
|
||||
|
||||
base = strrchr(pathname, '/');
|
||||
if (base == NULL)
|
||||
- base = pathname;
|
||||
+ base = (char*)pathname;
|
||||
else
|
||||
base++;
|
||||
@@ -184,7 +184,8 @@ static char *
|
||||
nsm_make_temp_pathname(const char *pathname)
|
||||
{
|
||||
size_t size;
|
||||
- char *path, *base;
|
||||
+ char *path;
|
||||
+ const char *base;
|
||||
int len;
|
||||
|
||||
size = strlen(pathname) + sizeof(".new") + 1;
|
||||
|
||||
Reference in New Issue
Block a user