Using POSIX-standard memory functions (bzero -> memset, bcopy -> memm…

…ove)
tomcucinotta · Oct 5, 2023 · c2588a7 · c2588a7
1 parent b2453bb
commit c2588a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/dw_client.c b/src/dw_client.c
@@ -144,9 +144,9 @@ void hostport_parse_and_config(char* host_str, struct sockaddr_in* addr) {
            inet_ntoa(*(struct in_addr *)e->h_addr));
 
     // Build Internet address
-    bzero((char *) addr, sizeof(struct sockaddr_in));
+    memset((char *) addr, '\0', sizeof(struct sockaddr_in));
     addr->sin_family = AF_INET;
-    bcopy((char *)e->h_addr, (char *) &addr->sin_addr.s_addr, e->h_length);
+    memmove((char *) &addr->sin_addr.s_addr, (char *)e->h_addr, e->h_length);
     addr->sin_port = htons(port);
 
     if (port_str)
@@ -412,9 +412,8 @@ void *thread_receiver(void *data) {
                 }
                 // make sure we reset the send timestamp and elapsed array to
                 // zeros for the next session
-                bzero(&usecs_send[thread_id][0], sizeof(usecs_send[thread_id]));
-                bzero(&usecs_elapsed[thread_id][0],
-                      sizeof(usecs_elapsed[thread_id]));
+                memset(&usecs_send[thread_id][0], 0, sizeof(usecs_send[thread_id]));
+                memset(&usecs_elapsed[thread_id][0], 0, sizeof(usecs_elapsed[thread_id]));
             }
             cw_log("Joining sender thread\n");
             pthread_join(sender[thread_id], NULL);

diff --git a/src/dw_node.c b/src/dw_node.c
@@ -463,7 +463,7 @@ int start_forward(int conn_id, message_t *m, int cmd_id, int epollfd) {
         cw_log("connecting to: %s:%d\n", inet_ntoa((struct in_addr) {m->cmds[cmd_id].u.fwd.fwd_host}),
                ntohs(m->cmds[cmd_id].u.fwd.fwd_port));
         struct sockaddr_in addr;
-        bzero((char *) &addr, sizeof(addr));
+        memset((char *) &addr, '\0', sizeof(addr));
         addr.sin_family = AF_INET;
         addr.sin_addr.s_addr = m->cmds[cmd_id].u.fwd.fwd_host;
         addr.sin_port = m->cmds[cmd_id].u.fwd.fwd_port;
@@ -736,7 +736,7 @@ int process_messages(int conn_id, int epollfd, thread_info_t* infos) {
                 "Moving %lu leftover bytes back to beginning of buf with "
                 "conn_id %d",
                 leftover, conn_id);
-            memmove(conns[conn_id].recv_buf, conns[conn_id].curr_proc_buf, leftover);
+            memmove(conns[conn_id].curr_proc_buf, conns[conn_id].recv_buf, leftover);
             conns[conn_id].curr_recv_buf = conns[conn_id].recv_buf + leftover;
             conns[conn_id].curr_recv_size = BUF_SIZE - leftover;
         }
@@ -1016,7 +1016,7 @@ void* storage_worker(void* args) {
         }
 
         struct itimerspec ts;
-        bzero(&ts,sizeof(ts));
+        memset(&ts, 0, sizeof(ts));
 
         struct timespec ts_template;
         ts_template.tv_sec =  infos->periodic_sync_msec / 1000;