Remove `delete_user_by_uid' since it's never been used in any logs we have,

[moira.git] / reg_svr / requests.c

diff --git a/reg_svr/requests.c b/reg_svr/requests.c
index 98ec328980aea86799b642423394cee3735945ad..5e81ba3f7c05741746eba522ce7f69f8a7f75b3c 100644 (file)
--- a/reg_svr/requests.c
+++ b/reg_svr/requests.c
@@ -87,14 +87,14 @@ void req_initialize()
        com_err(whoami,errno," socket");
        exit(1);
     }
-    bzero((char *)&sin,(int)sizeof(sin));
+    memset(&sin, 0, sizeof(sin));
     
     sin.sin_family = AF_INET;
     sin.sin_port = sp->s_port;
     sin.sin_addr.s_addr = INADDR_ANY;
     
     /* Bind a name to the socket */
-    if (bind(s, &sin, sizeof(sin)) < 0) 
+    if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) 
     {
        com_err(whoami,errno," bind");
        exit(1);
@@ -122,7 +122,7 @@ int handle_retransmitted()
 #endif
            status = TRUE;
            (void) sendto(s, requests[i].out_pkt, requests[i].out_pktlen, 
-                         0, &sin, addrlen);
+                         0, (struct sockaddr *)&sin, addrlen);
            break;
        }
     }
@@ -143,7 +143,8 @@ void respond(status,text)
     if (format_pkt(CUR_REQ.out_pkt, &(CUR_REQ.out_pktlen), 
                   CUR_REQ.seqno, status, text))
        com_err(whoami,0,"Client error message was truncated.");
-    (void) sendto(s, CUR_REQ.out_pkt, CUR_REQ.out_pktlen, 0, &sin, addrlen);
+    (void) sendto(s, CUR_REQ.out_pkt, CUR_REQ.out_pktlen, 0,
+                 (struct sockaddr *)&sin, addrlen);
 
     cur_request_index = NEXT_INDEX(cur_request_index);
 }
@@ -161,7 +162,8 @@ void get_request(message)
        com_err(whoami, 0, "*** Ready for next request ***");
        addrlen = sizeof(sin);
        /* Receive a packet */
-       if ((pktlen = recvfrom(s,packet,sizeof(packet),0,&sin,&addrlen)) < 0) 
+       if ((pktlen = recvfrom(s,packet,sizeof(packet),0,
+                              (struct sockaddr *)&sin,&addrlen)) < 0) 
        {
            com_err(whoami, errno, " recvfrom");
            /* Don't worry if error is interrupted system call. */
@@ -215,11 +217,11 @@ int format_pkt(packet, pktlenp, seqno, cl_status, message)
     U_32BIT vers = htonl((U_32BIT)CUR_UREG_VERSION);
     cl_status = htonl((U_32BIT)cl_status);
     /* Put current user registration protocol version into the packet */
-    bcopy((char *)&vers, packet, sizeof(U_32BIT));
+    memcpy(packet, &vers, sizeof(U_32BIT));
     /* Put sequence number into the packet */
-    bcopy((char *)&seqno, packet+sizeof(U_32BIT), sizeof(U_32BIT));
+    memcpy(packet+sizeof(U_32BIT), &seqno, sizeof(U_32BIT));
     /* Put error status into the packet */
-    bcopy((char *)&cl_status, packet+ 2*sizeof(U_32BIT), sizeof(U_32BIT));
+    memcpy(packet+ 2*sizeof(U_32BIT), &cl_status, sizeof(U_32BIT));
     
     /* Find out how much of the message to copy; truncate if too short. */
     /* How much room is there left? */
@@ -229,7 +231,7 @@ int format_pkt(packet, pktlenp, seqno, cl_status, message)
     {
        status = FAILURE;       /* Message was truncated */
        /* Truncate the message */
-       message[len-1] = NULL;
+       message[len-1] = '\0';
     }
 
     /* Copy the message into the packet */
@@ -292,7 +294,7 @@ parse_pkt(packet, pktlen, message)
     if (status == SUCCESS)
     {
        /* Extract the user registration protocol version from the packet */
-       bcopy(packet, (char *)&message->version, sizeof(long));
+       memcpy(&message->version, packet, sizeof(long));
        /* Convert byte order from network to host */
        message->version = ntohl(message->version);
        /* Verify version */
@@ -312,7 +314,7 @@ parse_pkt(packet, pktlen, message)
     if (status == SUCCESS)
     {
        /* Extract the sequence number from the packet */
-       bcopy(packet, (char *)&CUR_REQ.seqno, sizeof(long));
+       memcpy(&CUR_REQ.seqno, packet, sizeof(long));
        
        packet += sizeof(U_32BIT);
        pktlen -= sizeof(U_32BIT);
@@ -324,7 +326,7 @@ parse_pkt(packet, pktlen, message)
     if (status == SUCCESS)
     {
        /* Extract the request from the packet */
-       bcopy(packet, (char *)(&message->request), sizeof(U_32BIT));
+       memcpy(&message->request, packet, sizeof(U_32BIT));
        message->request = ntohl(message->request);
        packet += sizeof(U_32BIT);
        pktlen -= sizeof(U_32BIT);