From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Zhao Liu" <zhao1.liu@intel.com>,
"Cédric Le Goater" <clg@redhat.com>,
"Eric Farman" <farman@linux.ibm.com>
Subject: [PULL 13/17] hw/s390x/ccw: Replace dirname() with g_path_get_dirname()
Date: Thu, 11 Jan 2024 18:00:42 +0100 [thread overview]
Message-ID: <20240111170047.909117-14-thuth@redhat.com> (raw)
In-Reply-To: <20240111170047.909117-1-thuth@redhat.com>
From: Zhao Liu <zhao1.liu@intel.com>
As commit 3e015d815b3f ("use g_path_get_basename instead of basename")
said, g_path_get_dirname() should be preferred over dirname() since
the former is a portable utility function that has the advantage of not
modifying the string argument.
Replace dirname() with g_path_get_dirname().
Suggested-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Message-ID: <20231221171921.57784-3-zhao1.liu@linux.intel.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Eric Farman <farman@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/s390x/s390-ccw.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/s390x/s390-ccw.c b/hw/s390x/s390-ccw.c
index ab7022a3ab..5261e66724 100644
--- a/hw/s390x/s390-ccw.c
+++ b/hw/s390x/s390-ccw.c
@@ -77,6 +77,7 @@ static void s390_ccw_get_dev_info(S390CCWDevice *cdev,
{
unsigned int cssid, ssid, devid;
char dev_path[PATH_MAX] = {0};
+ g_autofree char *tmp_dir = NULL;
g_autofree char *tmp = NULL;
if (!sysfsdev) {
@@ -93,7 +94,8 @@ static void s390_ccw_get_dev_info(S390CCWDevice *cdev,
cdev->mdevid = g_path_get_basename(dev_path);
- tmp = g_path_get_basename(dirname(dev_path));
+ tmp_dir = g_path_get_dirname(dev_path);
+ tmp = g_path_get_basename(tmp_dir);
if (sscanf(tmp, "%2x.%1x.%4x", &cssid, &ssid, &devid) != 3) {
error_setg_errno(errp, errno, "Failed to read %s", tmp);
return;
--
2.43.0
next prev parent reply other threads:[~2024-01-11 17:04 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-11 17:00 [PULL 00/17] Misc patches (qtests, s390x, m68k, gitlab-ci) Thomas Huth
2024-01-11 17:00 ` [PULL 01/17] q800: move dp8393x_prom memory region to Q800MachineState Thomas Huth
2024-01-11 17:00 ` [PULL 02/17] qtest: use correct boolean type for failover property Thomas Huth
2024-01-11 17:00 ` [PULL 03/17] Revert "netdev: set timeout depending on loadavg" Thomas Huth
2024-01-11 17:00 ` [PULL 04/17] Revert "osdep: add getloadavg" Thomas Huth
2024-01-11 17:00 ` [PULL 05/17] Revert "tests/qtest/netdev-socket: Raise connection timeout to 120 seconds" Thomas Huth
2024-01-11 17:00 ` [PULL 06/17] net: add explicit info about connecting/listening state Thomas Huth
2024-01-11 17:00 ` [PULL 07/17] net: handle QIOTask completion to report useful error message Thomas Huth
2024-01-11 17:00 ` [PULL 08/17] qtest: ensure netdev-socket tests have non-overlapping names Thomas Huth
2024-01-11 17:00 ` [PULL 09/17] tests/qtest/virtio-ccw: Fix device presence checking Thomas Huth
2024-01-11 17:00 ` [PULL 10/17] gitlab: fix s390x tag for avocado-system-centos Thomas Huth
2024-01-11 17:00 ` [PULL 11/17] target/s390x/kvm/pv: Provide some more useful information if decryption fails Thomas Huth
2024-01-11 17:00 ` [PULL 12/17] hw/s390x/ccw: Replace basename() with g_path_get_basename() Thomas Huth
2024-01-11 17:00 ` Thomas Huth [this message]
2024-01-11 17:00 ` [PULL 14/17] scripts/checkpatch: Support codespell checking Thomas Huth
2024-01-11 17:00 ` [PULL 15/17] target/s390x: Fix LAE setting a wrong access register Thomas Huth
2024-01-11 17:00 ` [PULL 16/17] tests/tcg/s390x: Test LOAD ADDRESS EXTENDED Thomas Huth
2024-01-11 17:00 ` [PULL 17/17] .gitlab-ci.d/buildtest.yml: Work around htags bug when environment is large Thomas Huth
2024-01-12 17:27 ` [PULL 00/17] Misc patches (qtests, s390x, m68k, gitlab-ci) Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240111170047.909117-14-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=clg@redhat.com \
--cc=farman@linux.ibm.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=zhao1.liu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).