Convert bcmp to memcmp.
Index: bin/ksh/emacs.c
===================================================================
RCS file: /cvs/src/bin/ksh/emacs.c,v
retrieving revision 1.48
diff -u -p -r1.48 emacs.c
--- bin/ksh/emacs.c 17 Dec 2013 16:37:05 -0000 1.48
+++ bin/ksh/emacs.c 13 Feb 2015 16:33:01 -0000
@@ -331,7 +331,7 @@ x_emacs(char *buf, size_t len)
if (at > k->len)
continue;
- if (!bcmp(k->seq, line, at)) {
+ if (memcmp(k->seq, line, at) == 0) {
/* sub match */
submatch++;
if (k->len == at)
@@ -1296,7 +1296,7 @@ kb_match(char *s)
if (len > k->len)
continue;
- if (!bcmp(k->seq, s, len))
+ if (memcmp(k->seq, s, len) == 0)
return (1);
}
Index: sbin/dhclient/dhclient.c
===================================================================
RCS file: /cvs/src/sbin/dhclient/dhclient.c,v
retrieving revision 1.358
diff -u -p -r1.358 dhclient.c
--- sbin/dhclient/dhclient.c 10 Feb 2015 04:20:26 -0000 1.358
+++ sbin/dhclient/dhclient.c 13 Feb 2015 16:33:11 -0000
@@ -2475,7 +2475,7 @@ add_default_route(struct in_addr addr, s
* to emulate the '-iface' variant of 'route'. This is done by
* claiming there is no gateway address to use.
*/
- if (bcmp(&gateway, &addr, sizeof(addr)) != 0) {
+ if (memcmp(&gateway, &addr, sizeof(addr)) != 0) {
addrs |= RTA_GATEWAY | RTA_IFA;
flags |= RTF_GATEWAY | RTF_STATIC;
}
Index: sbin/iked/ikev2_msg.c
===================================================================
RCS file: /cvs/src/sbin/iked/ikev2_msg.c,v
retrieving revision 1.40
diff -u -p -r1.40 ikev2_msg.c
--- sbin/iked/ikev2_msg.c 6 Feb 2015 10:39:01 -0000 1.40
+++ sbin/iked/ikev2_msg.c 13 Feb 2015 16:33:28 -0000
@@ -75,7 +75,7 @@ ikev2_msg_cb(int fd, short event, void *
if (socket_getport((struct sockaddr *)&msg.msg_local) ==
IKED_NATT_PORT) {
- if (bcmp(&natt, buf, sizeof(natt)) != 0)
+ if (memcmp(&natt, buf, sizeof(natt)) != 0)
return;
msg.msg_natt = 1;
off = sizeof(natt);
Index: sbin/isakmpd/ike_phase_1.c
===================================================================
RCS file: /cvs/src/sbin/isakmpd/ike_phase_1.c,v
retrieving revision 1.73
diff -u -p -r1.73 ike_phase_1.c
--- sbin/isakmpd/ike_phase_1.c 22 Aug 2014 07:59:52 -0000 1.73
+++ sbin/isakmpd/ike_phase_1.c 13 Feb 2015 16:33:47 -0000
@@ -1070,7 +1070,7 @@ ike_phase_1_recv_ID(struct message *msg)
}
/* Compare expected/desired and received remote ID */
- if (bcmp(rid, payload->p + ISAKMP_ID_DATA_OFF, sz)) {
+ if (memcmp(rid, payload->p + ISAKMP_ID_DATA_OFF, sz) != 0) {
free(rid);
log_print("ike_phase_1_recv_ID: "
"received remote ID other than expected %s", p);
