aboutsummaryrefslogtreecommitdiffstats
path: root/libexec_setenvf_noreplace.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2024-05-05 17:56:50 +0200
committerMattias Andrée <maandree@kth.se>2024-05-05 17:59:12 +0200
commit924f443d62bfabf8761da31ed890791d5893463a (patch)
treeaa544535fca95a653844aea8d233b2450246d88a /libexec_setenvf_noreplace.c
parentFirst commit (diff)
downloadlibexec-924f443d62bfabf8761da31ed890791d5893463a.tar.gz
libexec-924f443d62bfabf8761da31ed890791d5893463a.tar.bz2
libexec-924f443d62bfabf8761da31ed890791d5893463a.tar.xz
Remove libexec_init_command, doc stuff, make functions inline, and fix a bug
libexec_init_command was a huge oversight, it cannot be used as it would set .library_version to the libraries version of LIBEXEC_VERSION rather than the application's; instead LIBEXEC_COMMAND_INIT should be used. Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to 'libexec_setenvf_noreplace.c')
-rw-r--r--libexec_setenvf_noreplace.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/libexec_setenvf_noreplace.c b/libexec_setenvf_noreplace.c
index 9480c7f..0385fff 100644
--- a/libexec_setenvf_noreplace.c
+++ b/libexec_setenvf_noreplace.c
@@ -3,16 +3,7 @@
#ifndef TEST
-int
-libexec_setenvf_noreplace(struct libexec_command *cmd, const char *name, const char *value_fmt, ...)
-{
- int ret;
- va_list args;
- va_start(args, value_fmt);
- ret = libexec_vsetenvf_noreplace(cmd, name, value_fmt, args);
- va_end(args);
- return ret;
-}
+extern inline int libexec_setenvf_noreplace(struct libexec_command *, const char *, const char *, ...);
#else
@@ -28,7 +19,7 @@ main(void)
ASSERT_EQ_INT(libexec_setenvf_noreplace(NULL, "X", "Y"), -1);
ASSERT_EQ_INT(errno, EINVAL);
- libexec_init_command(&cmd);
+ cmd = LIBEXEC_COMMAND_INIT;
memcpy(&ref, &cmd, sizeof(cmd));
errno = 0;
@@ -105,7 +96,7 @@ main(void)
libexec_destroy_command(&cmd);
- libexec_init_command(&cmd);
+ cmd = LIBEXEC_COMMAND_INIT;
env = environ;
environ = calloc(2, sizeof(*environ));
ASSERT_NOT_NULL(environ);