Skip to content
Permalink
Browse files

rename accept_socket to accept_socket_master

Fixes issue Task #116
  • Loading branch information...
alesliehughes committed Aug 11, 2010
1 parent 11df48b commit 89ad2e9e534810d8ec7ffd1f2c9f2f131700e12a
Showing with 3 additions and 4 deletions.
  1. +2 −3 libdrqueue/communications.c
  2. +1 −1 master.c
@@ -104,9 +104,8 @@ get_socket (uint16_t port) {
return sfd;
}

// FIXME: should be named accept_socket_master
int
accept_socket (int sfd, struct database *wdb, struct sockaddr_in *addr) {
accept_socket_master (int sfd, struct database *wdb, struct sockaddr_in *addr) {
int fd;
socklen_t len;

@@ -119,7 +118,7 @@ accept_socket (int sfd, struct database *wdb, struct sockaddr_in *addr) {

if ((fd = accept (sfd,(struct sockaddr *)addr,&len)) == -1) {
drerrno_system = errno;
log_auto (L_ERROR,"accept_socket(): error accepting connection. Msg: %s",strerror(drerrno_system));
log_auto (L_ERROR,"accept_socket_master(): error accepting connection. Msg: %s",strerror(drerrno_system));
return fd;
}

@@ -128,7 +128,7 @@ int main (int argc, char *argv[]) {
if (n_children < MASTERNCHILDREN) {
if ((child = fork()) == 0) {
set_signal_handlers_child_conn_handler ();
if ((csfd = accept_socket (sfd,wdb,&addr)) != -1) {
if ((csfd = accept_socket_master (sfd,wdb,&addr)) != -1) {
#ifdef COMM_REPORT
long int bsentb = bsent; /* Bytes sent before */
long int brecvb = brecv; /* Bytes received before */

0 comments on commit 89ad2e9

Please sign in to comment.
You can’t perform that action at this time.