diff options
author | David Gwynne <dlg@cvs.openbsd.org> | 2014-01-19 03:08:57 +0000 |
---|---|---|
committer | David Gwynne <dlg@cvs.openbsd.org> | 2014-01-19 03:08:57 +0000 |
commit | 13e40ae60675147e6ba8f40726df0f56bd4f5171 (patch) | |
tree | 2ae215646408344f4b062b0b19640ab9a20c5888 /sys | |
parent | 2350f355bec71b25f93356b563adf2ae950fb799 (diff) |
replace bcmp with memcmp
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/pci/if_myx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/if_myx.c b/sys/dev/pci/if_myx.c index 3d202d789f3..ce5bfd95e0e 100644 --- a/sys/dev/pci/if_myx.c +++ b/sys/dev/pci/if_myx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_myx.c,v 1.45 2014/01/19 03:05:46 dlg Exp $ */ +/* $OpenBSD: if_myx.c,v 1.46 2014/01/19 03:08:56 dlg Exp $ */ /* * Copyright (c) 2007 Reyk Floeter <reyk@openbsd.org> @@ -345,11 +345,11 @@ myx_query(struct myx_softc *sc, char *part, size_t partlen) maxlen = len - i; if (strings[i] == '\0') break; - if (maxlen > 4 && bcmp("MAC=", &strings[i], 4) == 0) { + if (maxlen > 4 && memcmp("MAC=", &strings[i], 4) == 0) { i += 4; i += myx_ether_aton(&strings[i], sc->sc_ac.ac_enaddr, maxlen); - } else if (maxlen > 3 && bcmp("PC=", &strings[i], 3) == 0) { + } else if (maxlen > 3 && memcmp("PC=", &strings[i], 3) == 0) { i += 3; i += strlcpy(part, &strings[i], min(maxlen, partlen)); } @@ -395,7 +395,7 @@ myx_loadfirmware(struct myx_softc *sc, const char *filename) betoh32(hdr.fw_type), hdr.fw_version); if (betoh32(hdr.fw_type) != MYXFW_TYPE_ETH || - bcmp(MYXFW_VER, hdr.fw_version, strlen(MYXFW_VER)) != 0) { + memcmp(MYXFW_VER, hdr.fw_version, strlen(MYXFW_VER)) != 0) { printf("%s: invalid firmware type 0x%x version %s\n", DEVNAME(sc), betoh32(hdr.fw_type), hdr.fw_version); goto err; |