| Message ID | 20241211192210.1864347-1-luiz.dentz@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5f0ec38851e165265627eb69158dbb336ce3fd02 |
| Headers | show |
| Series | [BlueZ,v2,1/5] tools: Use '>' as prompt end marker | expand |
| Context | Check | Description |
|---|---|---|
| tedd_an/pre-ci_am | success | Success |
| 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 tools/meshctl.c:324:33: warning: non-ANSI function declaration of function 'forget_mesh_devices' |
| tedd_an/bluezmakeextell | success | Make External ELL PASS |
| tedd_an/ScanBuild | success | Scan Build PASS |
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=916922 ---Test result--- Test Summary: CheckPatch PENDING 0.36 seconds GitLint PENDING 0.37 seconds BuildEll PASS 24.51 seconds BluezMake PASS 1618.75 seconds MakeCheck PASS 14.19 seconds MakeDistcheck PASS 159.14 seconds CheckValgrind PASS 212.20 seconds CheckSmatch WARNING 272.75 seconds bluezmakeextell PASS 98.82 seconds IncrementalBuild PENDING 0.48 seconds ScanBuild PASS 846.42 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: tools/meshctl.c:324:33: warning: non-ANSI function declaration of function 'forget_mesh_devices' ############################## Test: IncrementalBuild - PENDING Desc: Incremental build with the patches in the series Output: --- Regards, Linux Bluetooth
Hello: This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>: On Wed, 11 Dec 2024 14:22:06 -0500 you wrote: > From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> > > This replaces the use of '#' with '>' as prompt end marker since the > former is used to describe comments on the script which might be > confused with prompt. > --- > client/main.c | 6 +++--- > client/mgmt.c | 6 +++--- > tools/bluetooth-player.c | 2 +- > tools/btpclientctl.c | 2 +- > tools/mesh-cfgclient.c | 2 +- > tools/mesh-gatt/util.c | 2 +- > tools/mesh/util.c | 2 +- > tools/meshctl.c | 4 ++-- > 8 files changed, 13 insertions(+), 13 deletions(-) Here is the summary with links: - [BlueZ,v2,1/5] tools: Use '>' as prompt end marker https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=5f0ec38851e1 - [BlueZ,v2,2/5] bluetoothctl: Update documentation to use '>' as prompt end marker https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=d1eb37042d9d - [BlueZ,v2,3/5] share/hci: Introduce bt_hci_send_data https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=560dcd2ea3d2 - [BlueZ,v2,4/5] client: Add HCI submenu https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=5527c88bc717 - [BlueZ,v2,5/5] client: Add bluetoothctl-hci.1 man page https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=6905331e2cd8 You are awesome, thank you!
diff --git a/client/main.c b/client/main.c index 3f8143dde4b8..9258b44655dd 100644 --- a/client/main.c +++ b/client/main.c @@ -43,7 +43,7 @@ #define COLORED_CHG COLOR_YELLOW "CHG" COLOR_OFF #define COLORED_DEL COLOR_RED "DEL" COLOR_OFF -#define PROMPT_ON "[bluetooth]# " +#define PROMPT_ON "[bluetoothctl]> " #define PROMPT_OFF "Waiting to connect to bluetoothd..." static DBusConnection *dbus_conn; @@ -333,7 +333,7 @@ static void set_default_device(GDBusProxy *proxy, const char *attribute) path = g_dbus_proxy_get_path(proxy); dbus_message_iter_get_basic(&iter, &desc); - desc = g_strdup_printf("[%s%s%s]# ", desc, + desc = g_strdup_printf("[%s%s%s]> ", desc, attribute ? ":" : "", attribute ? attribute + strlen(path) : ""); @@ -2099,7 +2099,7 @@ static void set_default_local_attribute(char *attr) default_local_attr = attr; default_attr = NULL; - desc = g_strdup_printf("[%s]# ", attr); + desc = g_strdup_printf("[%s]> ", attr); bt_shell_set_prompt(desc, COLOR_BLUE); g_free(desc); diff --git a/client/mgmt.c b/client/mgmt.c index 59dcb3135344..1946d65d2fe2 100644 --- a/client/mgmt.c +++ b/client/mgmt.c @@ -71,16 +71,16 @@ static int pending_index = 0; #define MIN(x, y) ((x) < (y) ? (x) : (y)) #endif -#define PROMPT_ON COLOR_BLUE "[mgmt]" COLOR_OFF "# " +#define PROMPT_ON COLOR_BLUE "[mgmt]" COLOR_OFF "> " static void update_prompt(uint16_t index) { char str[32]; if (index == MGMT_INDEX_NONE) - snprintf(str, sizeof(str), "[mgmt]# "); + snprintf(str, sizeof(str), "[mgmt]> "); else - snprintf(str, sizeof(str), "[hci%u]# ", index); + snprintf(str, sizeof(str), "[hci%u]> ", index); bt_shell_set_prompt(str, COLOR_BLUE); } diff --git a/tools/bluetooth-player.c b/tools/bluetooth-player.c index 83045ca3fe41..63a95b878fb8 100644 --- a/tools/bluetooth-player.c +++ b/tools/bluetooth-player.c @@ -33,7 +33,7 @@ #include "src/shared/shell.h" #include "client/player.h" -#define PROMPT "[bluetooth]# " +#define PROMPT "[bluetooth-player]> " static DBusConnection *dbus_conn; diff --git a/tools/btpclientctl.c b/tools/btpclientctl.c index eb97463148d2..f6f61ed5d651 100644 --- a/tools/btpclientctl.c +++ b/tools/btpclientctl.c @@ -34,7 +34,7 @@ #define DEFAULT_SOCKET_PATH "/tmp/bt-stack-tester" -#define PROMPT_ON COLOR_BLUE "[btpclient]" COLOR_OFF "# " +#define PROMPT_ON COLOR_BLUE "[btpclient]" COLOR_OFF "> " #define EVT_OPCODE_BASE 0x80 diff --git a/tools/mesh-cfgclient.c b/tools/mesh-cfgclient.c index e64950a9cc65..3bd2b673ad7f 100644 --- a/tools/mesh-cfgclient.c +++ b/tools/mesh-cfgclient.c @@ -38,7 +38,7 @@ #include "tools/mesh/model.h" #include "tools/mesh/remote.h" -#define PROMPT_ON "[mesh-cfgclient]# " +#define PROMPT_ON "[mesh-cfgclient]> " #define PROMPT_OFF "Waiting to connect to bluetooth-meshd..." #define CFG_SRV_MODEL 0x0000 diff --git a/tools/mesh-gatt/util.c b/tools/mesh-gatt/util.c index 58f240a7748e..84fa7b5eedb0 100644 --- a/tools/mesh-gatt/util.c +++ b/tools/mesh-gatt/util.c @@ -29,7 +29,7 @@ void set_menu_prompt(const char *name, const char *id) { char *prompt; - prompt = g_strdup_printf("[%s%s%s]# ", name, + prompt = g_strdup_printf("[%s%s%s]> ", name, id ? ": Target = " : "", id ? id : ""); bt_shell_set_prompt(prompt, COLOR_BLUE); g_free(prompt); diff --git a/tools/mesh/util.c b/tools/mesh/util.c index 310aae0c63e6..6e81bf5f0285 100644 --- a/tools/mesh/util.c +++ b/tools/mesh/util.c @@ -28,7 +28,7 @@ void set_menu_prompt(const char *name, const char *id) { char *prompt; - prompt = l_strdup_printf("[%s%s%s]# ", name, + prompt = l_strdup_printf("[%s%s%s]> ", name, id ? ": Target = " : "", id ? id : ""); bt_shell_set_prompt(prompt, COLOR_BLUE); l_free(prompt); diff --git a/tools/meshctl.c b/tools/meshctl.c index 00a68a3d1d57..7b9c44b11e49 100644 --- a/tools/meshctl.c +++ b/tools/meshctl.c @@ -54,7 +54,7 @@ #define COLORED_CHG COLOR_YELLOW "CHG" COLOR_OFF #define COLORED_DEL COLOR_RED "DEL" COLOR_OFF -#define PROMPT_ON "[meshctl]# " +#define PROMPT_ON "[meshctl]> " #define PROMPT_OFF "Waiting to connect to bluetoothd..." #define MESH_PROV_DATA_IN_UUID_STR "00002adb-0000-1000-8000-00805f9b34fb" @@ -603,7 +603,7 @@ static void set_connected_device(GDBusProxy *proxy) goto done; dbus_message_iter_get_basic(&iter, &desc); - desc = g_strdup_printf(COLOR_BLUE "[%s%s%s]" COLOR_OFF "# ", desc, + desc = g_strdup_printf(COLOR_BLUE "[%s%s%s]" COLOR_OFF "> ", desc, (desc && mesh) ? "-" : "", mesh ? buf : "");
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com> This replaces the use of '#' with '>' as prompt end marker since the former is used to describe comments on the script which might be confused with prompt. --- client/main.c | 6 +++--- client/mgmt.c | 6 +++--- tools/bluetooth-player.c | 2 +- tools/btpclientctl.c | 2 +- tools/mesh-cfgclient.c | 2 +- tools/mesh-gatt/util.c | 2 +- tools/mesh/util.c | 2 +- tools/meshctl.c | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-)