mesh: Move local basename into utility file
Subsystems (2)
PATCH v2 1/1 mesh: Move local basename into utility file
Defining an override via a missing.h can prove difficult when a file needs to use basename and dirname both the APIs and needs to include libgen.h for them, in such situations there will be signature clash for basename function.
---
v2: Remove reference to missing.h in Makefile.mesh
Makefile.mesh | 2 +- mesh/mesh-config-json.c | 3 +-- mesh/missing.h | 21 --------------------- mesh/rpl.c | 3 +-- mesh/util.c | 10 ++++++++++ mesh/util.h | 5 +++++ 6 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 mesh/missing.h
Makefile.mesh +1 -1
@@ -38,7 +38,7 @@ mesh_sources = mesh/mesh.h mesh/mesh.c \ mesh/keyring.h mesh/keyring.c \ mesh/rpl.h mesh/rpl.c \ mesh/prv-beacon.h mesh/prvbeac-server.c \ - mesh/mesh-defs.h mesh/missing.h + mesh/mesh-defs.h pkglibexec_PROGRAMS += mesh/bluetooth-meshd mesh/mesh.$(OBJEXT): ell/internal
mesh/mesh-config-json.c +1 -2
@@ -28,7 +28,6 @@#include <ell/ell.h> #include <json-c/json.h> -#include "mesh/missing.h" #include "mesh/mesh-defs.h" #include "mesh/util.h" #include "mesh/mesh-config.h"
@@ -2708,7 +2707,7 @@ void mesh_config_destroy_nvm(struct mesh_config *cfg)if (!hex2str (cfg->uuid,16 , uuid,sizeof (uuid)))return ; - node_name =basename (node_dir); + node_name =mesh_basename (node_dir);/* Make sure path name of node follows expected guidelines */ if (strcmp (node_name, uuid))
mesh/missing.h deleted +0 -21
@@ -1,21 +0,0 @@ -// SPDX-License-Identifier: LGPL-2.1-or-later -/* -* -* BlueZ - Bluetooth protocol stack for Linux -* -* Copyright (C) 2024 Khem Raj <[email protected]> -* -*/ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif -#if !HAVE_DECL_BASENAME -#include <string.h> -static inline const char *basename (const char *path) -{ -const char *base =strrchr (path,'/' ); - -return base ? base +1 : path; -} -#endif
mesh/rpl.c +1 -2
@@ -24,7 +24,6 @@#include <ell/ell.h> -#include "mesh/missing.h" #include "mesh/mesh-defs.h" #include "mesh/node.h"
@@ -147,7 +146,7 @@ static void get_entries(const char *iv_path, struct l_queue *rpl_list)if (!dir)return ; - iv_txt =basename (iv_path); + iv_txt =mesh_basename (iv_path);if (sscanf (iv_txt,"%08x" , &iv_index) !=1 ) {closedir (dir);return ;
mesh/util.c +10 -0
@@ -161,3 +161,13 @@ void enable_debug(void) debug_enabled = true;l_debug_enable ("*" ); } + +#if !HAVE_DECL_BASENAME +#include <string.h> +const char *mesh_basename (const char *path) +{ +const char *base =strrchr (path,'/' ); + +return base ? base +1 : path; +} +#endif
mesh/util.h +5 -0
@@ -16,3 +16,8 @@ void print_packet(const char *label, const void *data, uint16_t size);int create_dir (const char *dir_name);void del_path (const char *path);void enable_debug (void ); +#if !HAVE_DECL_BASENAME +const char *mesh_basename (const char *path); +#else +#define mesh_basename basename +#endif
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=890809
---Test result---
Test Summary:
CheckPatch PASS 0.42 seconds GitLint PASS 0.28 seconds BuildEll PASS 25.04 seconds BluezMake PASS 1608.99 seconds MakeCheck PASS 13.66 seconds MakeDistcheck PASS 177.00 seconds CheckValgrind PASS 250.78 seconds CheckSmatch PASS 354.34 seconds bluezmakeextell PASS 120.50 seconds IncrementalBuild PASS 1397.43 seconds ScanBuild PASS 990.54 seconds
---
Regards,
Linux Bluetooth
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This patch was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 8 lines · On Mon, 16 Sep 2024 20:17:45 -0700 you wrote:
Defining an override via a
missing.hcan prove difficult when a file needs to use basename and dirname both the APIs and needs to includelibgen.hfor them, in such situations there will be signature clash for basename function.
---
v2: Remove reference tomissing.hin Makefile.mesh[...]
Here is the summary with links:
- [v2] mesh: Move local basename into utility file
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=7104f37735cd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html