29c29
< __FBSDID("$FreeBSD: head/sys/boot/efi/loader/devicename.c 293724 2016-01-12 02:17:39Z smh $");
---
> __FBSDID("$FreeBSD: head/sys/boot/efi/loader/devicename.c 294060 2016-01-15 01:22:36Z smh $");
33a34
> #include <sys/param.h>
89c90
< int i, err;
---
> int i;
104,106c105
< idev = malloc(sizeof(struct devdesc));
< if (idev == NULL)
< return (ENOMEM);
---
> np = devspec + strlen(dv->dv_name);
108,110c107,110
< idev->d_dev = dv;
< idev->d_type = dv->dv_type;
< idev->d_unit = -1;
---
> {
> idev = malloc(sizeof(struct devdesc));
> if (idev == NULL)
> return (ENOMEM);
112,119c112,121
< err = 0;
< np = devspec + strlen(dv->dv_name);
< if (*np != '\0' && *np != ':') {
< idev->d_unit = strtol(np, &cp, 0);
< if (cp == np) {
< idev->d_unit = -1;
< free(idev);
< return (EUNIT);
---
> idev->d_dev = dv;
> idev->d_type = dv->dv_type;
> idev->d_unit = -1;
> if (*np != '\0' && *np != ':') {
> idev->d_unit = strtol(np, &cp, 0);
> if (cp == np) {
> idev->d_unit = -1;
> free(idev);
> return (EUNIT);
> }
121a124
>
140c143
< static char buf[32]; /* XXX device length constant? */
---
> static char buf[SPECNAMELEN + 1];