[PATCH v2 1/3] build: link dundee with ell

[PATCH v2 1/3] build: link dundee with ell

[Denis Kenzior]

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 44fb7b1baef0..e60f4f2d2bee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -991,7 +991,7 @@ dundee_common_sources = $(gatchat_sources) \
 			dundee/dbus.c dundee/manager.c dundee/device.c
 
 dundee_dundee_LDADD = $(builtin_libadd) gdbus/libgdbus-internal.la \
-			@GLIB_LIBS@ @DBUS_LIBS@ -ldl
+			$(ell_ldadd) @GLIB_LIBS@ @DBUS_LIBS@ -ldl
 
 if DATAFILES
 dist_dbusconf_DATA += dundee/dundee.conf
-- 
2.45.0

[PATCH v2 2/3] log: Use l_basename instead of basename

[Denis Kenzior]

---
 src/log.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/log.c b/src/log.c
index fdfad362cfd1..4348f1be6191 100644
--- a/src/log.c
+++ b/src/log.c
@@ -28,13 +28,14 @@
 #include <unistd.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <string.h>
 #include <syslog.h>
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 #endif
 #include <dlfcn.h>
 
+#include <ell/ell.h>
+
 #include "ofono.h"
 
 static const char *program_exec;
@@ -309,7 +310,7 @@ int __ofono_log_init(const char *program, const char *debug,
 	signal_setup(signal_handler);
 #endif
 
-	openlog(basename(program), option, LOG_DAEMON);
+	openlog(l_basename(program), option, LOG_DAEMON);
 
 	syslog(LOG_INFO, "oFono version %s", VERSION);
 
-- 
2.45.0

[PATCH v2 3/3] qmi: Use l_basename instead of basename

[Denis Kenzior]

---
 drivers/qmimodem/qmi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/qmimodem/qmi.c b/drivers/qmimodem/qmi.c
index ce42e23c57f2..5b016f2d1227 100644
--- a/drivers/qmimodem/qmi.c
+++ b/drivers/qmimodem/qmi.c
@@ -1154,13 +1154,13 @@ static char *get_device_interface(struct qmi_device *device)
 	char * const driver_names[] = { "usbmisc", "usb" };
 	unsigned int i;
 	char file_path[PATH_MAX];
-	char *file_name;
+	const char *file_name;
 	char *interface = NULL;
 
 	if (!get_device_file_name(device, file_path, sizeof(file_path)))
 		return NULL;
 
-	file_name = basename(file_path);
+	file_name = l_basename(file_path);
 
 	for (i = 0; i < L_ARRAY_SIZE(driver_names) && !interface; i++) {
 		char *sysfs_path;
-- 
2.45.0

Re: [PATCH v2 1/3] build: link dundee with ell

[patchwork-bot+ofono]

Hello:

This series was applied to ofono.git (master)
by Denis Kenzior <denkenz@gmail.com>:

On Tue, 28 May 2024 14:32:19 -0500 you wrote:
> ---
>  Makefile.am | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Here is the summary with links:
  - [v2,1/3] build: link dundee with ell
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=59322e4d77ff
  - [v2,2/3] log: Use l_basename instead of basename
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=47165d458c32
  - [v2,3/3] qmi: Use l_basename instead of basename
    https://git.kernel.org/pub/scm/network/ofono/ofono.git/?id=0ef66f551977

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html