diff --git a/nsock/src/engine_epoll.c b/nsock/src/engine_epoll.c index f4afe09ea..edf2d5e6f 100644 --- a/nsock/src/engine_epoll.c +++ b/nsock/src/engine_epoll.c @@ -291,7 +291,7 @@ int epoll_loop(mspool *nsp, int msec_timeout) { } gettimeofday(&nsock_tod, NULL); /* Due to usleep or epoll delay */ - } while (results_left == -1 && sock_err == EINTR); /* repeat only if signal occured */ + } while (results_left == -1 && sock_err == EINTR); /* repeat only if signal occurred */ if (results_left == -1 && sock_err != EINTR) { nsock_trace(nsp, "nsock_loop error %d: %s", sock_err, socket_strerror(sock_err)); diff --git a/nsock/src/engine_select.c b/nsock/src/engine_select.c index e1e85a50a..196687b59 100644 --- a/nsock/src/engine_select.c +++ b/nsock/src/engine_select.c @@ -140,13 +140,13 @@ extern struct timeval nsock_tod; * Engine specific data structure */ struct select_engine_info { - /* Descriptors from which have pending READ events */ + /* Descriptors which have pending READ events */ fd_set fds_master_r; - /* Descriptors which we are tryint to WRITE to */ + /* Descriptors we are trying to WRITE to */ fd_set fds_master_w; - /* looking for exceptional events -- used with connect */ + /* Looking for exceptional events -- used with connect */ fd_set fds_master_x; /* For keeping track of the select results */ @@ -333,7 +333,7 @@ int select_loop(mspool *nsp, int msec_timeout) { } gettimeofday(&nsock_tod, NULL); /* Due to usleep or select delay */ - } while (results_left == -1 && sock_err == EINTR); /* repeat only if signal occured */ + } while (results_left == -1 && sock_err == EINTR); /* repeat only if signal occurred */ if (results_left == -1 && sock_err != EINTR) { nsock_trace(nsp, "nsock_loop error %d: %s", sock_err, socket_strerror(sock_err)); diff --git a/nsock/src/nsock_core.c b/nsock/src/nsock_core.c index e2abd3156..4c5fd6c8a 100644 --- a/nsock/src/nsock_core.c +++ b/nsock/src/nsock_core.c @@ -852,7 +852,7 @@ int pcap_read_on_nonselect(mspool *nsp) { /* Here is the all important looping function that tells the event engine to * start up and begin processing events. It will continue until all events have * been delivered (including new ones started from event handlers), or the - * msec_timeout is reached, or a major error has occured. Use -1 if you don't + * msec_timeout is reached, or a major error has occurred. Use -1 if you don't * want to set a maximum time for it to run. A timeout of 0 will return after 1 * non-blocking loop. The nsock loop can be restarted again after it returns. * For example you could do a series of 15 second runs, allowing you to do other @@ -998,7 +998,7 @@ void process_event(mspool *nsp, gh_list *evlist, msevent *nse, int ev) { handle_pcap_read_result(nsp, nse, NSE_STATUS_TIMEOUT); #if PCAP_BSD_SELECT_HACK - /* If event occured, and we're in BSD_HACK mode, then this event was added + /* If event occurred, and we're in BSD_HACK mode, then this event was added * to two queues. read_event and pcap_read_event * Of course we should destroy it only once. * I assume we're now in read_event, so just unlink this event from diff --git a/nsock/src/nsock_event.c b/nsock/src/nsock_event.c index c2ebfba58..3adf8b915 100644 --- a/nsock/src/nsock_event.c +++ b/nsock/src/nsock_event.c @@ -305,7 +305,7 @@ int msevent_cancel(mspool *nsp, msevent *nse, gh_list *event_list, gh_list_elem nse->id, &nsp->pcap_read_events, &nsp->read_events, event_list,((mspcap *)nse->iod->pcap)->pcap_desc); - /* If event occured, and we're in BSD_HACK mode, than this event was added to + /* If event occurred, and we're in BSD_HACK mode, then this event was added to * two queues. read_event and pcap_read_event Of course we should * destroy it only once. I assume we're now in read_event, so just unlink * this event from pcap_read_event */