[U-Boot] [PATCH v2 1/2] dm: core: Drop use of strlcpy()
We can use printf() to limit the string width. Adjust the code to do this instead of using strlcpy() which is a bit clumbsy.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v2: - Add new patch to drop use of strlcpy()
drivers/core/dump.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/core/dump.c b/drivers/core/dump.c index c3e109e7ed..1bb64098f4 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -14,11 +14,9 @@ static void show_devices(struct udevice *dev, int depth, int last_flag) { int i, is_last; struct udevice *child; - char class_name[12];
/* print the first 11 characters to not break the tree-format. */ - strlcpy(class_name, dev->uclass->uc_drv->name, sizeof(class_name)); - printf(" %-11s [ %c ] ", class_name, + printf(" %-10.10s [ %c ] ", dev->uclass->uc_drv->name, dev->flags & DM_FLAG_ACTIVATED ? '+' : ' ');
for (i = depth; i >= 0; i--) { @@ -50,7 +48,7 @@ void dm_dump_all(void)
root = dm_root(); if (root) { - printf(" Class Probed Name\n"); + printf(" Class Probed Name\n"); printf("----------------------------------------\n"); show_devices(root, -1, 0); }
It is often useful to see which driver was actually selected for each device. Add a new 'Driver' column to provide this information. Sample output:
Class Probed Driver Name ---------------------------------------- root [ + ] root_drive root_driver keyboard [ + ] i8042_kbd |-- keyboard serial [ + ] ns16550_se |-- serial rtc [ ] rtc_mc1468 |-- rtc timer [ + ] tsc_timer |-- tsc-timer syscon [ + ] ich6_pinct |-- pch_pinctrl pci [ + ] pci_x86 |-- pci northbridge [ + ] bd82x6x_no | |-- northbridge@0,0 video [ + ] bd82x6x_vi | |-- gma@2,0 vidconsole0 [ + ] vidconsole | | `-- gma@2,0.vidconsole0 ...
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com Tested-by: Bin Meng bmeng.cn@gmail.com ---
Changes in v2: - Drop one space between 'Probed' and 'Driver'
drivers/core/dump.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/core/dump.c b/drivers/core/dump.c index 1bb64098f4..6c6b944453 100644 --- a/drivers/core/dump.c +++ b/drivers/core/dump.c @@ -16,8 +16,8 @@ static void show_devices(struct udevice *dev, int depth, int last_flag) struct udevice *child;
/* print the first 11 characters to not break the tree-format. */ - printf(" %-10.10s [ %c ] ", dev->uclass->uc_drv->name, - dev->flags & DM_FLAG_ACTIVATED ? '+' : ' '); + printf(" %-10.10s [ %c ] %-10.10s ", dev->uclass->uc_drv->name, + dev->flags & DM_FLAG_ACTIVATED ? '+' : ' ', dev->driver->name);
for (i = depth; i >= 0; i--) { is_last = (last_flag >> i) & 1; @@ -48,7 +48,7 @@ void dm_dump_all(void)
root = dm_root(); if (root) { - printf(" Class Probed Name\n"); + printf(" Class Probed Driver Name\n"); printf("----------------------------------------\n"); show_devices(root, -1, 0); }
It is often useful to see which driver was actually selected for each device. Add a new 'Driver' column to provide this information. Sample output:
Class Probed Driver Name ---------------------------------------- root [ + ] root_drive root_driver keyboard [ + ] i8042_kbd |-- keyboard serial [ + ] ns16550_se |-- serial rtc [ ] rtc_mc1468 |-- rtc timer [ + ] tsc_timer |-- tsc-timer syscon [ + ] ich6_pinct |-- pch_pinctrl pci [ + ] pci_x86 |-- pci northbridge [ + ] bd82x6x_no | |-- northbridge@0,0 video [ + ] bd82x6x_vi | |-- gma@2,0 vidconsole0 [ + ] vidconsole | | `-- gma@2,0.vidconsole0 ...
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com Tested-by: Bin Meng bmeng.cn@gmail.com ---
Changes in v2: - Drop one space between 'Probed' and 'Driver'
drivers/core/dump.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Applied to u-boot-dm, thanks!
On Thu, Aug 3, 2017 at 2:12 AM, Simon Glass sjg@chromium.org wrote:
We can use printf() to limit the string width. Adjust the code to do this instead of using strlcpy() which is a bit clumbsy.
Signed-off-by: Simon Glass sjg@chromium.org
Changes in v2:
- Add new patch to drop use of strlcpy()
drivers/core/dump.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com Tested-by: Bin Meng bmeng.cn@gmail.com
On Thu, Aug 3, 2017 at 2:12 AM, Simon Glass sjg@chromium.org wrote:
We can use printf() to limit the string width. Adjust the code to do this instead of using strlcpy() which is a bit clumbsy.
Signed-off-by: Simon Glass sjg@chromium.org
Changes in v2:
- Add new patch to drop use of strlcpy()
drivers/core/dump.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com Tested-by: Bin Meng bmeng.cn@gmail.com
Applied to u-boot-dm, thanks!
participants (3)
-
Bin Meng -
Simon Glass -
sjg＠google.com