diff mbox series

[BlueZ,1/2] emulator: Skip new line when using util_debug

Message ID 20230919162745.894828-1-arkadiusz.bokowy@gmail.com (mailing list archive)
State Accepted
Commit eb9eaf01d1616246a261aba155d348401882184b
Headers show
Series [BlueZ,1/2] emulator: Skip new line when using util_debug | expand

Checks

Context Check Description
tedd_an/pre-ci_am success Success
tedd_an/CheckPatch success CheckPatch PASS
tedd_an/GitLint success Gitlint PASS
tedd_an/BuildEll success Build ELL PASS
tedd_an/BluezMake success Bluez Make PASS
tedd_an/MakeCheck success Bluez Make Check PASS
tedd_an/MakeDistcheck success Make Distcheck PASS
tedd_an/CheckValgrind success Check Valgrind PASS
tedd_an/CheckSmatch warning CheckSparse WARNING emulator/btdev.c:420:29: warning: Variable length array is used.
tedd_an/bluezmakeextell success Make External ELL PASS
tedd_an/IncrementalBuild success Incremental Build PASS
tedd_an/ScanBuild success Scan Build PASS

Commit Message

Arkadiusz Bokowy Sept. 19, 2023, 4:27 p.m. UTC
The debug callback vhci_debug() already prints new line after each debug
string. Explicit new line in the util_debug call causes double new line
in the output.
---
 emulator/btdev.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

Comments

bluez.test.bot@gmail.com Sept. 19, 2023, 5:53 p.m. UTC | #1
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=785675

---Test result---

Test Summary:
CheckPatch                    PASS      1.07 seconds
GitLint                       PASS      0.72 seconds
BuildEll                      PASS      27.95 seconds
BluezMake                     PASS      856.86 seconds
MakeCheck                     PASS      12.43 seconds
MakeDistcheck                 PASS      157.60 seconds
CheckValgrind                 PASS      257.99 seconds
CheckSmatch                   WARNING   348.58 seconds
bluezmakeextell               PASS      106.98 seconds
IncrementalBuild              PASS      1500.71 seconds
ScanBuild                     PASS      1069.65 seconds

Details
##############################
Test: CheckSmatch - WARNING
Desc: Run smatch tool with source
Output:
emulator/btdev.c:420:29: warning: Variable length array is used.


---
Regards,
Linux Bluetooth
patchwork-bot+bluetooth@kernel.org Sept. 19, 2023, 7:20 p.m. UTC | #2
Hello:

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

On Tue, 19 Sep 2023 18:27:44 +0200 you wrote:
> The debug callback vhci_debug() already prints new line after each debug
> string. Explicit new line in the util_debug call causes double new line
> in the output.
> ---
>  emulator/btdev.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)

Here is the summary with links:
  - [BlueZ,1/2] emulator: Skip new line when using util_debug
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=eb9eaf01d161
  - [BlueZ,2/2] hciemu: Call btdev_receive_h4 unconditionally
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=7f788a2c5162

You are awesome, thank you!
diff mbox series

Patch

diff --git a/emulator/btdev.c b/emulator/btdev.c
index 58414bd74..65ad0a40c 100644
--- a/emulator/btdev.c
+++ b/emulator/btdev.c
@@ -7298,16 +7298,17 @@  static const struct btdev_cmd *vnd_cmd(struct btdev *btdev, uint8_t op,
 					const struct btdev_cmd *cmd,
 					const void *data, uint8_t len)
 {
+	uint8_t opcode = ((const uint8_t *)data)[0];
+
 	for (; cmd && cmd->func; cmd++) {
-		if (cmd->opcode != ((uint8_t *)data)[0])
+		if (cmd->opcode != opcode)
 			continue;
 
 		return run_cmd(btdev, cmd, data, len);
 	}
 
 	util_debug(btdev->debug_callback, btdev->debug_data,
-			"Unsupported Vendor subcommand 0x%2.2x\n",
-			((uint8_t *)data)[0]);
+			"Unsupported Vendor subcommand 0x%2.2x", opcode);
 
 	cmd_status(btdev, BT_HCI_ERR_UNKNOWN_COMMAND, op);
 
@@ -7333,7 +7334,7 @@  static const struct btdev_cmd *default_cmd(struct btdev *btdev, uint16_t opcode,
 	}
 
 	util_debug(btdev->debug_callback, btdev->debug_data,
-			"Unsupported command 0x%4.4x\n", opcode);
+			"Unsupported command 0x%4.4x", opcode);
 
 	cmd_status(btdev, BT_HCI_ERR_UNKNOWN_COMMAND, opcode);
 
@@ -7521,7 +7522,7 @@  void btdev_receive_h4(struct btdev *btdev, const void *data, uint16_t len)
 		break;
 	default:
 		util_debug(btdev->debug_callback, btdev->debug_data,
-				"Unsupported packet 0x%2.2x\n", pkt_type);
+				"Unsupported packet 0x%2.2x", pkt_type);
 		break;
 	}
 }