diff mbox series

[BlueZ,1/5] main.conf: Fix parsing of CSIS group

Message ID 20230405231111.2636523-1-luiz.dentz@gmail.com (mailing list archive)
State Accepted
Commit a1b93db14da6772a299492a0c0673be70bea9ea6
Headers show
Series [BlueZ,1/5] main.conf: Fix parsing of CSIS group | 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 success CheckSparse PASS
tedd_an/bluezmakeextell success Make External ELL PASS
tedd_an/IncrementalBuild success Incremental Build PASS
tedd_an/ScanBuild warning ScanBuild: src/advertising.c:942:2: warning: Null pointer passed to 2nd parameter expecting 'nonnull' memcpy(cp->data + adv_data_len, scan_rsp, scan_rsp_len); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 1 warning generated.

Commit Message

Luiz Augusto von Dentz April 5, 2023, 11:11 p.m. UTC
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

There was a typo in the group name using CSIP instead of CSIS.
---
 src/main.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

bluez.test.bot@gmail.com April 6, 2023, 1:36 a.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=737372

---Test result---

Test Summary:
CheckPatch                    FAIL      2.88 seconds
GitLint                       FAIL      1.96 seconds
BuildEll                      PASS      27.21 seconds
BluezMake                     PASS      987.72 seconds
MakeCheck                     PASS      11.55 seconds
MakeDistcheck                 PASS      149.73 seconds
CheckValgrind                 PASS      247.03 seconds
CheckSmatch                   PASS      333.73 seconds
bluezmakeextell               PASS      99.93 seconds
IncrementalBuild              PASS      4208.79 seconds
ScanBuild                     WARNING   1059.51 seconds

Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script
Output:
[BlueZ,4/5] advertising: Add support for rsi as Includes
ERROR:SPACING: space prohibited before that ',' (ctx:WxW)
#170: FILE: src/advertising.c:507:
+	{ 0 , "rsi", set_rsi },
 	    ^

/github/workspace/src/src/13202645.patch total: 1 errors, 0 warnings, 83 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/src/13202645.patch has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.


[BlueZ,5/5] client/advertising: Add support for advertise.rsi command
ERROR:SPACING: spaces required around that ':' (ctx:VxW)
#129: FILE: client/advertising.c:181:
+	bt_shell_printf("RSI: %s\n", ad.rsi ? "on": "off");
 	                                          ^

/github/workspace/src/src/13202647.patch total: 1 errors, 0 warnings, 91 lines checked

NOTE: For some of the reported defects, checkpatch may be able to
      mechanically convert to the typical style using --fix or --fix-inplace.

/github/workspace/src/src/13202647.patch has style problems, please review.

NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO

NOTE: If any of the errors are false positives, please report
      them to the maintainer, see CHECKPATCH in MAINTAINERS.


##############################
Test: GitLint - FAIL
Desc: Run gitlint
Output:
[BlueZ,5/5] client/advertising: Add support for advertise.rsi command

WARNING: I3 - ignore-body-lines: gitlint will be switching from using Python regex 'match' (match beginning) to 'search' (match anywhere) semantics. Please review your ignore-body-lines.regex option accordingly. To remove this warning, set general.regex-style-search=True. More details: https://jorisroovers.github.io/gitlint/configuration/#regex-style-search
11: B3 Line contains hard tab characters (\t): "	 rsi [on/off]"
##############################
Test: ScanBuild - WARNING
Desc: Run Scan Build
Output:
src/advertising.c:942:2: warning: Null pointer passed to 2nd parameter expecting 'nonnull'
        memcpy(cp->data + adv_data_len, scan_rsp, scan_rsp_len);
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 warning generated.



---
Regards,
Linux Bluetooth
patchwork-bot+bluetooth@kernel.org April 6, 2023, 9 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 Wed,  5 Apr 2023 16:11:07 -0700 you wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
> 
> There was a typo in the group name using CSIP instead of CSIS.
> ---
>  src/main.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Here is the summary with links:
  - [BlueZ,1/5] main.conf: Fix parsing of CSIS group
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=a1b93db14da6
  - [BlueZ,2/5] shared/ad: Fix bt_ad_has_data not matching when only type is passed
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=759d1442a5dc
  - [BlueZ,3/5] advertising-api: Add rsi to SupportedIncludes
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=23bc47437a35
  - [BlueZ,4/5] advertising: Add support for rsi as Includes
    https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=eef2e62a5bc4
  - [BlueZ,5/5] client/advertising: Add support for advertise.rsi command
    (no matching commit)

You are awesome, thank you!
diff mbox series

Patch

diff --git a/src/main.c b/src/main.c
index 3198091fc12c..a64b833b58c1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -177,7 +177,7 @@  static const struct group_table {
 	{ "LE",		le_options },
 	{ "Policy",	policy_options },
 	{ "GATT",	gatt_options },
-	{ "CSIP",	csip_options },
+	{ "CSIS",	csip_options },
 	{ "AVDTP",	avdtp_options },
 	{ "AdvMon",	advmon_options },
 	{ }
@@ -1015,7 +1015,7 @@  static void parse_config(GKeyFile *config)
 		btd_opts.gatt_channels = val;
 	}
 
-	str = g_key_file_get_string(config, "CSIP", "SIRK", &err);
+	str = g_key_file_get_string(config, "CSIS", "SIRK", &err);
 	if (err) {
 		DBG("%s", err->message);
 		g_clear_error(&err);
@@ -1031,7 +1031,7 @@  static void parse_config(GKeyFile *config)
 		g_free(str);
 	}
 
-	boolean = g_key_file_get_boolean(config, "CSIP", "SIRK", &err);
+	boolean = g_key_file_get_boolean(config, "CSIS", "Encryption", &err);
 	if (err) {
 		DBG("%s", err->message);
 		g_clear_error(&err);
@@ -1041,7 +1041,7 @@  static void parse_config(GKeyFile *config)
 		btd_opts.csis.encrypt = boolean;
 	}
 
-	val = g_key_file_get_integer(config, "CSIP", "Size", &err);
+	val = g_key_file_get_integer(config, "CSIS", "Size", &err);
 	if (err) {
 		DBG("%s", err->message);
 		g_clear_error(&err);
@@ -1052,7 +1052,7 @@  static void parse_config(GKeyFile *config)
 		btd_opts.csis.size = val;
 	}
 
-	val = g_key_file_get_integer(config, "CSIP", "Rank", &err);
+	val = g_key_file_get_integer(config, "CSIS", "Rank", &err);
 	if (err) {
 		DBG("%s", err->message);
 		g_clear_error(&err);