diff --git a/mbus/mbus-serial.c b/mbus/mbus-serial.c index c0e009e..f5aa052 100644 --- a/mbus/mbus-serial.c +++ b/mbus/mbus-serial.c @@ -57,7 +57,7 @@ mbus_serial_connect(char *device) return NULL; } - bzero(&(handle->t), sizeof(handle->t)); + memset(&(handle->t), 0, sizeof(handle->t)); handle->t.c_cflag |= (CS8|CREAD|CLOCAL); handle->t.c_cflag |= PARENB; @@ -228,7 +228,7 @@ mbus_serial_recv_frame(mbus_serial_handle *handle, mbus_frame *frame) if (handle == NULL || frame == NULL) return -1; - bzero((void *)buff, sizeof(buff)); + memset((void *)buff, 0, sizeof(buff)); // // read data until a packet is received diff --git a/mbus/mbus-tcp.c b/mbus/mbus-tcp.c index c718413..a1fd098 100644 --- a/mbus/mbus-tcp.c +++ b/mbus/mbus-tcp.c @@ -78,7 +78,7 @@ mbus_tcp_connect(char *host, int port) return NULL; } - bcopy((void *)(host_addr->h_addr), (void *)(&s.sin_addr), host_addr->h_length); + memcpy((void *)(&s.sin_addr), (void *)(host_addr->h_addr), host_addr->h_length); if (connect(handle->sock, (struct sockaddr *)&s, sizeof(s)) < 0) { @@ -169,7 +169,7 @@ mbus_tcp_recv_frame(mbus_tcp_handle *handle, mbus_frame *frame) if (handle == NULL || frame == NULL) return -1; - bzero((void *)buff, sizeof(buff)); + memset((void *)buff, 0, sizeof(buff)); // // read data until a packet is received diff --git a/test/mbus_parse.c b/test/mbus_parse.c index 3f23999..69499b2 100644 --- a/test/mbus_parse.c +++ b/test/mbus_parse.c @@ -41,13 +41,13 @@ main(int argc, char *argv[]) return 1; } - bzero(buf, sizeof(buf)); + memset(buf, 0, sizeof(buf)); len = read(fd, buf, sizeof(buf)); close(fd); - bzero(&reply, sizeof(reply)); - bzero(&frame_data, sizeof(frame_data)); + memset(&reply, 0, sizeof(reply)); + memset(&frame_data, 0, sizeof(frame_data)); mbus_parse(&reply, buf, len); mbus_frame_data_parse(&reply, &frame_data); mbus_frame_print(&reply); diff --git a/test/mbus_parse_hex.c b/test/mbus_parse_hex.c index 913b0d2..41b9278 100644 --- a/test/mbus_parse_hex.c +++ b/test/mbus_parse_hex.c @@ -41,7 +41,7 @@ main(int argc, char *argv[]) return 1; } - bzero(raw_buff, sizeof(raw_buff)); + memset(raw_buff, 0, sizeof(raw_buff)); len = read(fd, raw_buff, sizeof(raw_buff)); close(fd); @@ -60,8 +60,8 @@ main(int argc, char *argv[]) i++; } - bzero(&reply, sizeof(reply)); - bzero(&frame_data, sizeof(frame_data)); + memset(&reply, 0, sizeof(reply)); + memset(&frame_data, 0, sizeof(frame_data)); //mbus_parse_set_debug(1);