[PATCH BlueZ 1/5] tools: iso-tester: add inclusion of time.h

[PATCH BlueZ 1/5] tools: iso-tester: add inclusion of time.h

[Christian Eggers]

Inclusion of <linux/errqueue.h> requires that 'struct timespec' has
already been defined:

| In file included from ../bluez-5.79/tools/iso-tester.c:21:
| /usr/include/linux/errqueue.h:57:25: error: array type has incomplete element type 'struct timespec'
|    57 |         struct timespec ts[3];
|       |                         ^~
---
 tools/iso-tester.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/iso-tester.c b/tools/iso-tester.c
index 640692b779c9..350775fddc96 100644
--- a/tools/iso-tester.c
+++ b/tools/iso-tester.c
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <poll.h>
 #include <stdbool.h>
+#include <time.h>
 
 #include <linux/errqueue.h>
 #include <linux/net_tstamp.h>
-- 
2.43.0

[PATCH BlueZ 2/5] mesh: include <time.h> before <ell/ell.h>

[Christian Eggers]

I get many of such warnings:

In file included from ../bluez-5.79/ell/ell.h:8,
                 from ../bluez-5.79/mesh/prov-initiator.c:15:
../bluez-5.79/ell/time-private.h:15:43: warning: 'struct timespec' declared inside parameter list will not be visible outside of this definition or declaration
   15 | uint64_t _time_from_timespec(const struct timespec *ts);
      |                                           ^~~~~~~~

It seems that there's no guarantee that 'struct timespec' will be
available via <sys/time.h>, so include <time.h> directly [1]

[1] https://libc-alpha.sourceware.narkive.com/yb0aXzSp/defining-timespec-in-time-h-or-sys-time-h#post3
---
 mesh/agent.c              | 2 ++
 mesh/appkey.c             | 2 ++
 mesh/cfgmod-server.c      | 1 +
 mesh/crypto.c             | 1 +
 mesh/dbus.c               | 2 ++
 mesh/friend.c             | 2 ++
 mesh/keyring.c            | 1 +
 mesh/main.c               | 1 +
 mesh/manager.c            | 2 ++
 mesh/mesh-config-json.c   | 1 +
 mesh/mesh-io-generic.c    | 1 +
 mesh/mesh-io-mgmt.c       | 1 +
 mesh/mesh-io-unit.c       | 1 +
 mesh/mesh-io.c            | 2 ++
 mesh/mesh-mgmt.c          | 2 ++
 mesh/mesh.c               | 2 ++
 mesh/model.c              | 1 +
 mesh/net-keys.c           | 2 ++
 mesh/net.c                | 1 +
 mesh/node.c               | 1 +
 mesh/pb-adv.c             | 2 ++
 mesh/prov-acceptor.c      | 2 ++
 mesh/prov-initiator.c     | 2 ++
 mesh/prvbeac-server.c     | 1 +
 mesh/remprv-server.c      | 1 +
 mesh/rpl.c                | 1 +
 src/shared/btp.c          | 1 +
 src/shared/io-ell.c       | 1 +
 src/shared/mainloop-ell.c | 1 +
 src/shared/timeout-ell.c  | 2 ++
 tools/mesh/cfgcli.c       | 1 +
 tools/mesh/keys.c         | 2 ++
 tools/mesh/remote.c       | 2 ++
 tools/mesh/util.c         | 1 +
 34 files changed, 49 insertions(+)

diff --git a/mesh/agent.c b/mesh/agent.c
index 2f9697a3330c..a1413c0008dc 100644
--- a/mesh/agent.c
+++ b/mesh/agent.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "mesh/mesh.h"
diff --git a/mesh/appkey.c b/mesh/appkey.c
index f31d8194298e..b03ddae4714d 100644
--- a/mesh/appkey.c
+++ b/mesh/appkey.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #define _GNU_SOURCE
 #include <ell/ell.h>
 
diff --git a/mesh/cfgmod-server.c b/mesh/cfgmod-server.c
index f64566daf39e..e5d5a86e0d8e 100644
--- a/mesh/cfgmod-server.c
+++ b/mesh/cfgmod-server.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <sys/time.h>
+#include <time.h>
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
diff --git a/mesh/crypto.c b/mesh/crypto.c
index b712a26549ad..b7607bb83794 100644
--- a/mesh/crypto.c
+++ b/mesh/crypto.c
@@ -15,6 +15,7 @@
 #define _GNU_SOURCE
 #include <unistd.h>
 #include <sys/socket.h>
+#include <time.h>
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
diff --git a/mesh/dbus.c b/mesh/dbus.c
index a7abdc428e88..c43d6550d87f 100644
--- a/mesh/dbus.c
+++ b/mesh/dbus.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
diff --git a/mesh/friend.c b/mesh/friend.c
index 5b73da68916f..6aacf6338f24 100644
--- a/mesh/friend.c
+++ b/mesh/friend.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
diff --git a/mesh/keyring.c b/mesh/keyring.c
index 1e1de3e54bfb..cb091e15b613 100644
--- a/mesh/keyring.c
+++ b/mesh/keyring.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
+#include <time.h>
 #include <unistd.h>
 
 #include <sys/stat.h>
diff --git a/mesh/main.c b/mesh/main.c
index 145bcfa98d85..5b8af4bc7345 100644
--- a/mesh/main.c
+++ b/mesh/main.c
@@ -18,6 +18,7 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <signal.h>
+#include <time.h>
 
 #include <sys/prctl.h>
 #include <sys/stat.h>
diff --git a/mesh/manager.c b/mesh/manager.c
index 0c98721bf4b5..63551b4ee4c7 100644
--- a/mesh/manager.c
+++ b/mesh/manager.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #define _GNU_SOURCE
 #include <ell/ell.h>
 
diff --git a/mesh/mesh-config-json.c b/mesh/mesh-config-json.c
index 5372130d7f8a..86e7d87e482e 100644
--- a/mesh/mesh-config-json.c
+++ b/mesh/mesh-config-json.c
@@ -21,6 +21,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <string.h>
+#include <time.h>
 #include <unistd.h>
 
 #include <sys/time.h>
diff --git a/mesh/mesh-io-generic.c b/mesh/mesh-io-generic.c
index 13a863b48158..3da0a8c2d227 100644
--- a/mesh/mesh-io-generic.c
+++ b/mesh/mesh-io-generic.c
@@ -15,6 +15,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/time.h>
+#include <time.h>
 #include <ell/ell.h>
 
 #include "monitor/bt.h"
diff --git a/mesh/mesh-io-mgmt.c b/mesh/mesh-io-mgmt.c
index 5f0eb206b3b2..d185f5c9760f 100644
--- a/mesh/mesh-io-mgmt.c
+++ b/mesh/mesh-io-mgmt.c
@@ -16,6 +16,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <sys/time.h>
+#include <time.h>
 #include <ell/ell.h>
 
 #include "monitor/bt.h"
diff --git a/mesh/mesh-io-unit.c b/mesh/mesh-io-unit.c
index a9fa53308eb1..4fd72bf8480d 100644
--- a/mesh/mesh-io-unit.c
+++ b/mesh/mesh-io-unit.c
@@ -19,6 +19,7 @@
 #include <sys/un.h>
 #include <unistd.h>
 #include <stdio.h>
+#include <time.h>
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
diff --git a/mesh/mesh-io.c b/mesh/mesh-io.c
index b953bf4cff81..99c7c2014375 100644
--- a/mesh/mesh-io.c
+++ b/mesh/mesh-io.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "lib/bluetooth.h"
diff --git a/mesh/mesh-mgmt.c b/mesh/mesh-mgmt.c
index fd21a168ab27..87036d180fe0 100644
--- a/mesh/mesh-mgmt.c
+++ b/mesh/mesh-mgmt.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "lib/bluetooth.h"
diff --git a/mesh/mesh.c b/mesh/mesh.c
index 91cf25175384..50059adbed57 100644
--- a/mesh/mesh.c
+++ b/mesh/mesh.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #define _GNU_SOURCE
 #include <ell/ell.h>
 
diff --git a/mesh/model.c b/mesh/model.c
index 4ccafa17edd4..01b21675c557 100644
--- a/mesh/model.c
+++ b/mesh/model.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <sys/time.h>
+#include <time.h>
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
diff --git a/mesh/net-keys.c b/mesh/net-keys.c
index 57a9df04a2a7..42d498ce0ede 100644
--- a/mesh/net-keys.c
+++ b/mesh/net-keys.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
diff --git a/mesh/net.c b/mesh/net.c
index 05ca48326fc5..cc862dade5ae 100644
--- a/mesh/net.c
+++ b/mesh/net.c
@@ -15,6 +15,7 @@
 #define _GNU_SOURCE
 
 #include <sys/time.h>
+#include <time.h>
 
 #include <ell/ell.h>
 
diff --git a/mesh/node.c b/mesh/node.c
index 93537c5ba4cc..a85814727d40 100644
--- a/mesh/node.c
+++ b/mesh/node.c
@@ -17,6 +17,7 @@
 #include <limits.h>
 #include <stdio.h>
 #include <sys/time.h>
+#include <time.h>
 
 #include <ell/ell.h>
 
diff --git a/mesh/pb-adv.c b/mesh/pb-adv.c
index 7a1dd87dc210..0b1fd7d577ff 100644
--- a/mesh/pb-adv.c
+++ b/mesh/pb-adv.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
diff --git a/mesh/prov-acceptor.c b/mesh/prov-acceptor.c
index fd9d4cd5d209..241345bdd1ea 100644
--- a/mesh/prov-acceptor.c
+++ b/mesh/prov-acceptor.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "src/shared/ecc.h"
diff --git a/mesh/prov-initiator.c b/mesh/prov-initiator.c
index e353d23865ef..dc19d1e9b7a5 100644
--- a/mesh/prov-initiator.c
+++ b/mesh/prov-initiator.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "src/shared/ecc.h"
diff --git a/mesh/prvbeac-server.c b/mesh/prvbeac-server.c
index dd0e4cbf449e..f318852b8a42 100644
--- a/mesh/prvbeac-server.c
+++ b/mesh/prvbeac-server.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <sys/time.h>
+#include <time.h>
 #include <ell/ell.h>
 
 #include "mesh/mesh-defs.h"
diff --git a/mesh/remprv-server.c b/mesh/remprv-server.c
index 927dbab0e361..53c764f8626a 100644
--- a/mesh/remprv-server.c
+++ b/mesh/remprv-server.c
@@ -22,6 +22,7 @@
 #endif
 
 #include <sys/time.h>
+#include <time.h>
 #include <ell/ell.h>
 
 #include "src/shared/ad.h"
diff --git a/mesh/rpl.c b/mesh/rpl.c
index 69533bf431b4..8de4a8d567b1 100644
--- a/mesh/rpl.c
+++ b/mesh/rpl.c
@@ -19,6 +19,7 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
+#include <time.h>
 
 #include <sys/stat.h>
 
diff --git a/src/shared/btp.c b/src/shared/btp.c
index e54eb830f9b4..04ccae9d81f1 100644
--- a/src/shared/btp.c
+++ b/src/shared/btp.c
@@ -11,6 +11,7 @@
 #include <stdbool.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#include <time.h>
 #include <unistd.h>
 
 #include <ell/ell.h>
diff --git a/src/shared/io-ell.c b/src/shared/io-ell.c
index dee9a95c945c..35dc38e2ee67 100644
--- a/src/shared/io-ell.c
+++ b/src/shared/io-ell.c
@@ -15,6 +15,7 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/socket.h>
+#include <time.h>
 
 #include <ell/ell.h>
 
diff --git a/src/shared/mainloop-ell.c b/src/shared/mainloop-ell.c
index 5cc0311c2a42..1aec7fad9e96 100644
--- a/src/shared/mainloop-ell.c
+++ b/src/shared/mainloop-ell.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <time.h>
 
 #include <ell/ell.h>
 
diff --git a/src/shared/timeout-ell.c b/src/shared/timeout-ell.c
index 02628692642a..7867c7570277 100644
--- a/src/shared/timeout-ell.c
+++ b/src/shared/timeout-ell.c
@@ -8,6 +8,8 @@
  *
  */
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "timeout.h"
diff --git a/tools/mesh/cfgcli.c b/tools/mesh/cfgcli.c
index 1a404af38ebd..fb6fa666d2db 100644
--- a/tools/mesh/cfgcli.c
+++ b/tools/mesh/cfgcli.c
@@ -14,6 +14,7 @@
 
 #include <stdio.h>
 #include <stdbool.h>
+#include <time.h>
 
 #include <ell/ell.h>
 
diff --git a/tools/mesh/keys.c b/tools/mesh/keys.c
index 134c1a10e210..d1d2ffefa1e6 100644
--- a/tools/mesh/keys.c
+++ b/tools/mesh/keys.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "src/shared/shell.h"
diff --git a/tools/mesh/remote.c b/tools/mesh/remote.c
index b917ae9df227..2d400081994e 100644
--- a/tools/mesh/remote.c
+++ b/tools/mesh/remote.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <time.h>
+
 #include <ell/ell.h>
 
 #include "src/shared/shell.h"
diff --git a/tools/mesh/util.c b/tools/mesh/util.c
index 6e81bf5f0285..c11010129f3e 100644
--- a/tools/mesh/util.c
+++ b/tools/mesh/util.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <stdio.h>
+#include <time.h>
 
 #include <ell/ell.h>
 
-- 
2.43.0

[PATCH BlueZ 3/5] tools/btpclient: include <time.h> before <ell/ell.h>

[Christian Eggers]

It seems that there's no guarantee that 'struct timespec' will be
available via <sys/time.h>, so include <time.h> directly [1]

[1] https://libc-alpha.sourceware.narkive.com/yb0aXzSp/defining-timespec-in-time-h-or-sys-time-h#post3
---
 tools/btpclient.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/btpclient.c b/tools/btpclient.c
index bdfff5df83c2..055270edb51b 100644
--- a/tools/btpclient.c
+++ b/tools/btpclient.c
@@ -17,6 +17,7 @@
 #include <assert.h>
 #include <getopt.h>
 #include <signal.h>
+#include <time.h>
 
 #include <ell/ell.h>
 
-- 
2.43.0

[PATCH BlueZ 4/5] client/player: fix printf format mismatch

[Christian Eggers]

%zd is meant for 'size_t' rather than 'off_t'. As there is no printf
length modifier for 'off_t', cast to a standard type which should be
large enough for on all platforms.
---
 client/player.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/player.c b/client/player.c
index 76fee0a0597d..acb709924d96 100644
--- a/client/player.c
+++ b/client/player.c
@@ -5551,10 +5551,11 @@ static int transport_send_seq(struct transport *transport, int fd, uint32_t num)
 
 		offset = lseek(fd, 0, SEEK_CUR);
 
-		bt_shell_echo("[seq %d %d.%03ds] send: %zd/%zd bytes",
+		bt_shell_echo("[seq %d %d.%03ds] send: %lld/%lld bytes",
 				transport->seq, secs,
 				(nsecs + 500000) / 1000000,
-				offset, transport->stat.st_size);
+				(long long int)offset,
+				(long long int)transport->stat.st_size);
 	}
 
 	free(buf);
-- 
2.43.0

[PATCH BlueZ 5/5] shared/bap: fix printf format mismatch

[Christian Eggers]

struct iovec::iov_len is 'size_t' rather than 'long int'.
https://man7.org/linux/man-pages/man3/iovec.3type.html
---
 src/shared/bap.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/shared/bap.c b/src/shared/bap.c
index 1cf0fcfb9b79..5d4d69d2925b 100644
--- a/src/shared/bap.c
+++ b/src/shared/bap.c
@@ -7313,7 +7313,7 @@ bool bt_bap_parse_base(struct iovec *iov,
 	uint8_t sgrps;
 	bool ret = true;
 
-	util_debug(func, NULL, "BASE len: %ld", iov->iov_len);
+	util_debug(func, NULL, "BASE len: %zd", iov->iov_len);
 
 	if (!util_iov_pull_le24(iov, &delay))
 		return false;
@@ -7359,7 +7359,7 @@ bool bt_bap_parse_base(struct iovec *iov,
 		l2_cc.iov_len = l2_cc_len;
 
 		/* Print Codec Specific Configuration */
-		util_debug(func, NULL, "CC len: %ld", l2_cc.iov_len);
+		util_debug(func, NULL, "CC len: %zd", l2_cc.iov_len);
 		bt_bap_debug_config(l2_cc.iov_base, l2_cc.iov_len,
 								func, NULL);
 
-- 
2.43.0

RE: [BlueZ,1/5] tools: iso-tester: add inclusion of time.h

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 2343 bytes --]

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=945530

---Test result---

Test Summary:
CheckPatch                    PENDING   0.23 seconds
GitLint                       PENDING   0.26 seconds
BuildEll                      PASS      20.50 seconds
BluezMake                     PASS      1506.66 seconds
MakeCheck                     PASS      12.74 seconds
MakeDistcheck                 PASS      157.32 seconds
CheckValgrind                 PASS      212.85 seconds
CheckSmatch                   WARNING   282.90 seconds
bluezmakeextell               PASS      97.90 seconds
IncrementalBuild              PENDING   0.31 seconds
ScanBuild                     WARNING   866.83 seconds

Details
##############################
Test: CheckPatch - PENDING
Desc: Run checkpatch.pl script
Output:

##############################
Test: GitLint - PENDING
Desc: Run gitlint
Output:

##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
mesh/mesh-io-mgmt.c:524:67: warning: Variable length array is used.src/shared/bap.c:313:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:313:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structuressrc/shared/bap.c:313:25: warning: array of flexible structuressrc/shared/bap.c: note: in included file:./src/shared/ascs.h:88:25: warning: array of flexible structures
##############################
Test: IncrementalBuild - PENDING
Desc: Incremental build with the patches in the series
Output:

##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:
1 warning generated.
tools/gatt-service.c:294:2: warning: 2nd function call argument is an uninitialized value
tools/btgatt-server.c:1212:2: warning: Value stored to 'argv' is never read
        chr_write(chr, value, len);
        argv -= optind;
        ^~~~~~~~~~~~~~~~~~~~~~~~~~
        ^       ~~~~~~
1 warning generated.



---
Regards,
Linux Bluetooth

Re: [PATCH BlueZ 1/5] tools: iso-tester: add inclusion of time.h

[patchwork-bot+bluetooth]

Hello:

This series was applied to bluetooth/bluez.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Wed, 19 Mar 2025 11:37:20 +0100 you wrote:
> Inclusion of <linux/errqueue.h> requires that 'struct timespec' has
> already been defined:
> 
> | In file included from ../bluez-5.79/tools/iso-tester.c:21:
> | /usr/include/linux/errqueue.h:57:25: error: array type has incomplete element type 'struct timespec'
> |    57 |         struct timespec ts[3];
> |       |                         ^~
> 
> [...]

Here is the summary with links:
  - [BlueZ,1/5] tools: iso-tester: add inclusion of time.h
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=d26a7f96cdd4
  - [BlueZ,2/5] mesh: include <time.h> before <ell/ell.h>
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=6f26f2f8de7f
  - [BlueZ,3/5] tools/btpclient: include <time.h> before <ell/ell.h>
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=ba9f9fbde34a
  - [BlueZ,4/5] client/player: fix printf format mismatch
    (no matching commit)
  - [BlueZ,5/5] shared/bap: fix printf format mismatch
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=50a01b0c17e9

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