summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Browning <rlb@defaultvalue.org>2024-08-03 13:32:09 -0500
committerRob Browning <rlb@defaultvalue.org>2024-08-03 14:29:47 -0500
commit9a57c237d27ed146158cd92e2883f7110b8f2e43 (patch)
tree812ba6b6b54e45f1be2c08ec16e9d964ddde85f6
parent2047b532fad1632cfcfc8b7c1521ef619e622c82 (diff)
downloadguile-9a57c237d27ed146158cd92e2883f7110b8f2e43.tar.gz
basename: drop last_component null check
Prepare for fixes to the suffix pruning. Since last_component doesn't document a possible null result in lib/basename-lgpl.h, and the current code also doesn't appear capable of producing one, drop the check. libguile/filesys.c (basename): drop check for last_component null result.
-rw-r--r--libguile/filesys.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/libguile/filesys.c b/libguile/filesys.c
index 70a6ef6eb..5b1453bf6 100644
--- a/libguile/filesys.c
+++ b/libguile/filesys.c
@@ -2043,7 +2043,7 @@ SCM_DEFINE (scm_basename, "basename", 1, 1, 0,
"@var{filename}, it is removed also.")
#define FUNC_NAME s_scm_basename
{
- char *c_filename, *c_last_component;
+ char *c_filename;
SCM res;
scm_dynwind_begin (0);
@@ -2057,13 +2057,8 @@ SCM_DEFINE (scm_basename, "basename", 1, 1, 0,
"/" and "//" are treated specially. */
res = scm_from_utf8_string ("/");
else
- {
- c_last_component = last_component (c_filename);
- if (!c_last_component)
- res = filename;
- else
- res = scm_from_utf8_string (c_last_component);
- }
+ res = scm_from_utf8_string (last_component (c_filename));
+
scm_dynwind_end ();
if (!SCM_UNBNDP (suffix) &&