Skip to content

Commit 86aa229

Browse files
Allan28818Allan28818
committed
refactor(methods-types): bzero was replaced by memset, because bzero is outdated
1 parent 60abb8f commit 86aa229

File tree

9 files changed

+53
-47
lines changed

9 files changed

+53
-47
lines changed

‎client_server/client.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#define _WINSOCK_DEPRECATED_NO_WARNINGS
77

88
#include <winsock2.h>
9-
#define bzero(b, len) (memset((b), '\0', (len)), (void)0)
109
#define read(a, b, c) recv(a, b, c, 0)
1110
#define write(a, b, c) send(a, b, c, 0)
1211
#define close closesocket
@@ -27,15 +26,14 @@ void func(int sockfd)
2726
int n;
2827
for (;;)
2928
{
30-
bzero(buff, sizeof(buff));
29+
memset(buff, 0, sizeof(buff));
3130
printf("Enter the string : ");
3231
n = 0;
3332
while ((buff[n++] = getchar()) != '\n')
3433
{
35-
;
3634
}
3735
write(sockfd, buff, sizeof(buff));
38-
bzero(buff, sizeof(buff));
36+
memset(buff, 0, sizeof(buff));
3937
read(sockfd, buff, sizeof(buff));
4038
printf("From Server : %s", buff);
4139
if ((strncmp(buff, "exit", 4)) == 0)
@@ -63,8 +61,10 @@ int main()
6361
atexit(cleanup);
6462
#endif
6563

66-
int sockfd, connfd;
67-
struct sockaddr_in servaddr, cli;
64+
int sockfd;
65+
int connfd;
66+
struct sockaddr_in servaddr;
67+
struct sockaddr_in cli;
6868

6969
sockfd = socket(AF_INET, SOCK_STREAM, 0);
7070
if (sockfd == -1)
@@ -76,7 +76,7 @@ int main()
7676
{
7777
printf("Socket successfully created..\n");
7878
}
79-
bzero(&servaddr, sizeof(servaddr));
79+
memset(&servaddr, 0, sizeof(servaddr));
8080

8181
servaddr.sin_family = AF_INET;
8282
servaddr.sin_addr.s_addr = inet_addr("127.0.0.1");

‎client_server/remote_command_exec_udp_client.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#ifdef _WIN32
2-
#define bzero(b, len) (memset((b), '\0', (len)), (void)0)
32
#define close _close
43
#include <Ws2tcpip.h>
54
#include <io.h>
@@ -29,7 +28,8 @@ void error()
2928
int main()
3029
{
3130
uint32_t sockfd;
32-
char send_msg[1024], recv_msg[1024];
31+
char send_msg[1024];
32+
char recv_msg[1024];
3333

3434
struct sockaddr_in server_addr;
3535

@@ -40,7 +40,7 @@ int main()
4040
error();
4141
}
4242

43-
bzero(&server_addr, sizeof(server_addr));
43+
memset(&server_addr, 0, sizeof(server_addr));
4444
server_addr.sin_family = AF_INET;
4545
server_addr.sin_port = htons(PORT);
4646
server_addr.sin_addr.s_addr = htonl(INADDR_ANY);

‎client_server/remote_command_exec_udp_server.c‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#ifdef _WIN32
2-
#define bzero(b, len) (memset((b), '\0', (len)), (void)0)
32
#define close _close
43
#include <Ws2tcpip.h>
54
#include <io.h>
@@ -29,9 +28,11 @@ void error()
2928
int main()
3029
{
3130
uint32_t sockfd;
32-
char recv_msg[1024], success_message[] = "Command Executed Successfully!\n";
31+
char recv_msg[1024];
32+
char success_message[] = "Command Executed Successfully!\n";
3333

34-
struct sockaddr_in server_addr, client_addr;
34+
struct sockaddr_in server_addr;
35+
struct sockaddr_in client_addr;
3536

3637
socklen_t clientLength = sizeof(client_addr);
3738

@@ -40,7 +41,7 @@ int main()
4041
error();
4142
}
4243

43-
bzero(&server_addr, sizeof(server_addr));
44+
memset(&server_addr, 0, sizeof(server_addr));
4445
server_addr.sin_family = AF_INET;
4546
server_addr.sin_port = htons(PORT);
4647
server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -54,7 +55,7 @@ int main()
5455

5556
while (1)
5657
{
57-
bzero(recv_msg, sizeof(recv_msg));
58+
memset(recv_msg, 0, sizeof(recv_msg));
5859
recvfrom(sockfd, recv_msg, sizeof(recv_msg), 0,
5960
(struct sockaddr *)&client_addr, &clientLength);
6061
printf("Command Output: \n");

‎client_server/server.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#define _WINSOCK_DEPRECATED_NO_WARNINGS
77

88
#include <winsock2.h>
9-
#define bzero(b, len) (memset((b), '\0', (len)), (void)0)
109
#define read(a, b, c) recv(a, b, c, 0)
1110
#define write(a, b, c) send(a, b, c, 0)
1211
#define close closesocket
@@ -34,16 +33,15 @@ void func(int sockfd)
3433

3534
for (;;)
3635
{
37-
bzero(buff, MAX);
36+
memset(buff, 0, MAX);
3837

3938
read(sockfd, buff, sizeof(buff));
4039

4140
printf("From client: %s\t To client : ", buff);
42-
bzero(buff, MAX);
41+
memset(buff, 0, MAX);
4342
n = 0;
4443
while ((buff[n++] = getchar()) != '\n')
4544
{
46-
;
4745
}
4846

4947
write(sockfd, buff, sizeof(buff));
@@ -69,9 +67,11 @@ int main()
6967
atexit(cleanup);
7068
#endif
7169

72-
int sockfd, connfd;
70+
int sockfd;
71+
int connfd;
7372
unsigned int len;
74-
struct sockaddr_in servaddr, cli;
73+
struct sockaddr_in servaddr;
74+
struct sockaddr_in cli;
7575

7676
sockfd = socket(AF_INET, SOCK_STREAM, 0);
7777
if (sockfd == -1)
@@ -83,7 +83,7 @@ int main()
8383
{
8484
printf("Socket successfully created..\n");
8585
}
86-
bzero(&servaddr, sizeof(servaddr));
86+
memset(&servaddr, 0, sizeof(servaddr));
8787

8888
servaddr.sin_family = AF_INET;
8989
servaddr.sin_addr.s_addr = htonl(INADDR_ANY);

‎client_server/tcp_full_duplex_client.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#ifdef _WIN32
2-
#define bzero(b, len) (memset((b), '\0', (len)), (void)0)
32
#define pid_t int
43
#define close _close
54
#include <Ws2tcpip.h>
@@ -33,7 +32,8 @@ void error()
3332
int main()
3433
{
3534
uint32_t sockfd;
36-
char sendbuff[1024], recvbuff[1024];
35+
char sendbuff[1024];
36+
char recvbuff[1024];
3737

3838
struct sockaddr_in server_addr;
3939

@@ -42,7 +42,7 @@ int main()
4242
error();
4343
}
4444

45-
bzero(&server_addr, sizeof(server_addr));
45+
memset(&server_addr, 0, sizeof(server_addr));
4646
server_addr.sin_family = AF_INET;
4747
server_addr.sin_port = htons(PORT);
4848
server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -60,7 +60,7 @@ int main()
6060
{
6161
while (1)
6262
{
63-
bzero(&sendbuff, sizeof(sendbuff));
63+
memset(&sendbuff, 0, sizeof(sendbuff));
6464
printf("\nType message here: ");
6565
fgets(sendbuff, 1024, stdin);
6666
send(sockfd, sendbuff, strlen(sendbuff) + 1, 0);
@@ -72,7 +72,7 @@ int main()
7272
{
7373
while (1)
7474
{
75-
bzero(&recvbuff, sizeof(recvbuff));
75+
memset(&recvbuff, 0, sizeof(recvbuff));
7676
recv(sockfd, recvbuff, sizeof(recvbuff), 0);
7777
printf("\nSERVER: %s\n", recvbuff);
7878
sleep(5);

‎client_server/tcp_full_duplex_server.c‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#ifdef _WIN32
2-
#define bzero(b, len) (memset((b), '\0', (len)), (void)0)
32
#define pid_t int
43
#define close _close
54
#include <Ws2tcpip.h>
@@ -32,10 +31,13 @@ void error()
3231

3332
int main()
3433
{
35-
uint32_t sockfd, conn;
36-
char recvbuff[1024], sendbuff[1024];
34+
uint32_t sockfd;
35+
uint32_t conn;
36+
char recvbuff[1024];
37+
char sendbuff[1024];
3738

38-
struct sockaddr_in server_addr, client_addr;
39+
struct sockaddr_in server_addr;
40+
struct sockaddr_in client_addr;
3941

4042
socklen_t ClientLen;
4143

@@ -44,7 +46,7 @@ int main()
4446
error();
4547
}
4648

47-
bzero(&server_addr, sizeof(server_addr));
49+
memset(&server_addr, 0, sizeof(server_addr));
4850
server_addr.sin_family = AF_INET;
4951
server_addr.sin_port = htons(PORT);
5052
server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -78,7 +80,7 @@ int main()
7880
{
7981
while (1)
8082
{
81-
bzero(&recvbuff, sizeof(recvbuff));
83+
memset(&recvbuff, 0, sizeof(recvbuff));
8284
recv(conn, recvbuff, sizeof(recvbuff), 0);
8385
printf("\nCLIENT : %s\n", recvbuff);
8486
sleep(5);
@@ -88,7 +90,7 @@ int main()
8890
{
8991
while (1)
9092
{
91-
bzero(&sendbuff, sizeof(sendbuff));
93+
memset(&sendbuff, 0, sizeof(sendbuff));
9294
printf("\nType message here: ");
9395
fgets(sendbuff, 1024, stdin);
9496
send(conn, sendbuff, strlen(sendbuff) + 1, 0);

‎client_server/tcp_half_duplex_client.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#ifdef _WIN32
2-
#define bzero(b, len) (memset((b), '\0', (len)), (void)0)
32
#define close _close
43
#include <Ws2tcpip.h>
54
#include <io.h>
@@ -28,14 +27,15 @@ int main()
2827
uint32_t sockfd;
2928
struct sockaddr_in server_addr;
3029

31-
char serverResponse[10000], clientResponse[10000];
30+
char serverResponse[10000];
31+
char clientResponse[10000];
3232

3333
if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
3434
{
3535
error();
3636
}
3737

38-
bzero(&server_addr, sizeof(server_addr));
38+
memset(&server_addr, 0, sizeof(server_addr));
3939
server_addr.sin_family = AF_INET;
4040
server_addr.sin_port = htons(PORT);
4141
server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -48,8 +48,8 @@ int main()
4848

4949
while (1)
5050
{
51-
bzero(&serverResponse, sizeof(serverResponse));
52-
bzero(&clientResponse, sizeof(clientResponse));
51+
memset(&serverResponse, 0, sizeof(serverResponse));
52+
memset(&clientResponse, 0, sizeof(clientResponse));
5353

5454
recv(sockfd, serverResponse, sizeof(serverResponse), 0);
5555
printf("\nServer message: %s \n", serverResponse);

‎client_server/tcp_half_duplex_server.c‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#ifdef _WIN32
2-
#define bzero(b, len) (memset((b), '\0', (len)), (void)0)
32
#define close _close
43
#include <Ws2tcpip.h>
54
#include <io.h>
@@ -25,17 +24,20 @@ void error()
2524

2625
int main()
2726
{
28-
uint32_t sockfd, conn;
29-
char server_msg[10000], client_msg[10000];
27+
uint32_t sockfd;
28+
uint32_t conn;
29+
char server_msg[10000];
30+
char client_msg[10000];
3031

31-
struct sockaddr_in server_addr, client_addr;
32+
struct sockaddr_in server_addr;
33+
struct sockaddr_in client_addr;
3234

3335
if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
3436
{
3537
error();
3638
}
3739

38-
bzero(&server_addr, sizeof(server_addr));
40+
memset(&server_addr, 0, sizeof(server_addr));
3941
server_addr.sin_family = AF_INET;
4042
server_addr.sin_port = htons(PORT);
4143
server_addr.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -57,8 +59,8 @@ int main()
5759

5860
while (1)
5961
{
60-
bzero(&server_msg, sizeof(server_msg));
61-
bzero(&client_msg, sizeof(client_msg));
62+
memset(&server_msg, 0, sizeof(server_msg));
63+
memset(&client_msg, 0, sizeof(client_msg));
6264

6365
printf("\nEnter message here: ");
6466
fgets(server_msg, 10000, stdin);

‎client_server/udp_server.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ int main()
3939
int sockfd;
4040
char buffer[MAXLINE];
4141
char *hello = "Hello from server";
42-
struct sockaddr_in servaddr, cliaddr;
42+
struct sockaddr_in servaddr;
43+
struct sockaddr_in cliaddr;
4344

4445
if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
4546
{

0 commit comments

Comments
 (0)