Author: araujo
Date: Fri Feb 1 03:09:11 2019
New Revision: 343642
URL: https://svnweb.freebsd.org/changeset/base/343642
Log:
Revert r343634:
Mostly a cosmetic change to replace strlen with strnlen.
Requested by: kib and imp
Modified:
head/usr.sbin/bhyve/bhyverun.c
head/usr.sbin/bhyve/smbiostbl.c
head/usr.sbin/bhyve/usb_mouse.c
Modified: head/usr.sbin/bhyve/bhyverun.c
==============================================================================
--- head/usr.sbin/bhyve/bhyverun.c Fri Feb 1 03:02:52 2019
(r343641)
+++ head/usr.sbin/bhyve/bhyverun.c Fri Feb 1 03:09:11 2019
(r343642)
@@ -233,8 +233,8 @@ usage(int code)
" -W: force virtio to use single-vector MSI\n"
" -x: local apic is in x2APIC mode\n"
" -Y: disable MPtable generation\n",
- progname, (int)strnlen(progname, PATH_MAX), "",
(int)strnlen(progname, PATH_MAX), "",
- (int)strnlen(progname, PATH_MAX), "");
+ progname, (int)strlen(progname), "", (int)strlen(progname), "",
+ (int)strlen(progname), "");
exit(code);
}
Modified: head/usr.sbin/bhyve/smbiostbl.c
==============================================================================
--- head/usr.sbin/bhyve/smbiostbl.c Fri Feb 1 03:02:52 2019
(r343641)
+++ head/usr.sbin/bhyve/smbiostbl.c Fri Feb 1 03:09:11 2019
(r343642)
@@ -558,7 +558,7 @@ smbios_generic_initializer(struct smbios_structure *te
int len;
string = template_strings[i];
- len = strnlen(string, SMBIOS_MAX_LENGTH) + 1;
+ len = strlen(string) + 1;
memcpy(curaddr, string, len);
curaddr += len;
}
@@ -611,7 +611,7 @@ smbios_type1_initializer(struct smbios_structure *temp
return (-1);
MD5Init(&mdctx);
- MD5Update(&mdctx, vmname, strnlen(vmname, PATH_MAX));
+ MD5Update(&mdctx, vmname, strlen(vmname));
MD5Update(&mdctx, hostname, sizeof(hostname));
MD5Final(digest, &mdctx);
Modified: head/usr.sbin/bhyve/usb_mouse.c
==============================================================================
--- head/usr.sbin/bhyve/usb_mouse.c Fri Feb 1 03:02:52 2019
(r343641)
+++ head/usr.sbin/bhyve/usb_mouse.c Fri Feb 1 03:09:11 2019
(r343642)
@@ -70,7 +70,6 @@ enum {
UMSTR_MAX
};
-#define UMOUSE_DESC_MAX_LEN 32
static const char *umouse_desc_strings[] = {
"\x04\x09",
"BHYVE",
@@ -442,7 +441,7 @@ umouse_request(void *scarg, struct usb_data_xfer *xfer
goto done;
}
- slen = 2 + strnlen(str, UMOUSE_DESC_MAX_LEN) * 2;
+ slen = 2 + strlen(str) * 2;
udata[0] = slen;
udata[1] = UDESC_STRING;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
