Deleted Added
full compact
28c28
< __FBSDID("$FreeBSD: stable/11/sys/boot/userboot/userboot/userboot_disk.c 315221 2017-03-14 02:06:03Z pfg $");
---
> __FBSDID("$FreeBSD: stable/11/sys/boot/userboot/userboot/userboot_disk.c 328889 2018-02-05 17:01:18Z kevans $");
63c63
< static void userdisk_print(int verbose);
---
> static int userdisk_print(int verbose);
119c119
< static void
---
> static int
124c124
< int i;
---
> int i, ret = 0;
125a126,132
> if (userdisk_maxunit == 0)
> return (0);
>
> printf("%s devices:", userboot_disk.dv_name);
> if ((ret = pager_output("\n")) != 0)
> return (ret);
>
127,128c134,138
< sprintf(line, " disk%d: Guest drive image\n", i);
< pager_output(line);
---
> snprintf(line, sizeof(line),
> " disk%d: Guest drive image\n", i);
> ret = pager_output(line);
> if (ret != 0)
> break;
135,136c145,146
< sprintf(line, " disk%d", i);
< disk_print(&dev, line, verbose);
---
> snprintf(line, sizeof(line), " disk%d", i);
> ret = disk_print(&dev, line, verbose);
137a148,149
> if (ret != 0)
> break;
139a152
> return (ret);