mesh: Move local basename into utility file
PATCH 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.
--- mesh/mesh-config-json.c | 3 +-- mesh/missing.h | 21 --------------------- mesh/rpl.c | 3 +-- mesh/util.c | 10 ++++++++++ mesh/util.h | 5 +++++ 5 files changed, 17 insertions(+), 25 deletions(-) delete mode 100644 mesh/missing.h
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=890794
---Test result---
Test Summary:
CheckPatch PASS 0.29 seconds GitLint PASS 0.83 seconds BuildEll PASS 24.66 seconds BluezMake PASS 1681.32 seconds MakeCheck PASS 13.09 seconds MakeDistcheck FAIL 8.85 seconds CheckValgrind PASS 253.18 seconds CheckSmatch PASS 355.93 seconds bluezmakeextell PASS 119.70 seconds IncrementalBuild PASS 1425.61 seconds ScanBuild PASS 1012.84 seconds
Details
##############################
Test: MakeDistcheck - FAIL
Desc: Run Bluez Make Distcheck
Output:
make[2]: *** No rule to make target 'mesh/missing.h', needed by 'distdir-am'. Stop. make[1]: *** [Makefile:12146: distdir] Error 2
make: *** [Makefile:12222: dist] Error 2
---
Regards,
Linux Bluetooth