diff options
Diffstat (limited to 'src/nSocket')
| -rw-r--r-- | src/nSocket/include/nstack_dmm_api.h | 2 | ||||
| -rw-r--r-- | src/nSocket/nstack/event/epoll/nstack_eventpoll.c | 1 | ||||
| -rw-r--r-- | src/nSocket/nstack/nstack_module.h | 2 | ||||
| -rw-r--r-- | src/nSocket/nstack/nstack_socket.c | 4 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/nSocket/include/nstack_dmm_api.h b/src/nSocket/include/nstack_dmm_api.h index 481e144..dff69f3 100644 --- a/src/nSocket/include/nstack_dmm_api.h +++ b/src/nSocket/include/nstack_dmm_api.h @@ -87,6 +87,6 @@ typedef struct __nstack_proc_cb } nstack_proc_cb; typedef int (*nstack_stack_register_fn) (nstack_proc_cb * proc_fun, - nstack_event_cb * event_ops); + nstack_event_cb * event_ops); #endif diff --git a/src/nSocket/nstack/event/epoll/nstack_eventpoll.c b/src/nSocket/nstack/event/epoll/nstack_eventpoll.c index a4ce0cc..a8b3757 100644 --- a/src/nSocket/nstack/event/epoll/nstack_eventpoll.c +++ b/src/nSocket/nstack/event/epoll/nstack_eventpoll.c @@ -762,7 +762,6 @@ nsep_epoll_close (int sock) nsep_set_infoSockMap (sock, NULL); - nstack_each_modInx (modInx) { if (0 == (epInfo->epaddflag & (1 << modInx))) diff --git a/src/nSocket/nstack/nstack_module.h b/src/nSocket/nstack/nstack_module.h index 00d0343..e0105af 100644 --- a/src/nSocket/nstack/nstack_module.h +++ b/src/nSocket/nstack/nstack_module.h @@ -51,7 +51,7 @@ extern "C"{ typedef struct __NSTACK_MODULE_KEYS { ns_char modName[MODULE_NAME_MAX]; /*stack name */ - ns_char register_fn_name[MODULE_NAME_MAX]; /*stack register fun name */ + ns_char register_fn_name[MODULE_NAME_MAX]; /*stack register fun name */ ns_char libPath[MODULE_NAME_MAX]; /*if libtype is dynamic, it is the path of lib */ ns_char deploytype; /*delpoly model type: model type1, model type2, model type3 */ ns_char libtype; /*dynamic lib or static lib */ diff --git a/src/nSocket/nstack/nstack_socket.c b/src/nSocket/nstack/nstack_socket.c index 59ab34e..e3da248 100644 --- a/src/nSocket/nstack/nstack_socket.c +++ b/src/nSocket/nstack/nstack_socket.c @@ -1344,7 +1344,7 @@ nstack_sendto (int fd, const void *buf, size_t len, int flags, int retval = 0; nstack_rd_key rdkey = { 0 }; - NSTACK_INIT_CHECK_RET (sendto, fd, buf, len, flags, dest_addr,addrlen); + NSTACK_INIT_CHECK_RET (sendto, fd, buf, len, flags, dest_addr, addrlen); NSSOC_LOGDBG ("(sockfd=%d, buf=%p, len=%zu, flags=%d, dest_addr=%p, addrlen=%u) [Caller]", @@ -2436,7 +2436,7 @@ nstack_epoll_ctl (int epfd, int op, int fd, struct epoll_event *event) if (!epi) { ep_event.events |= (EPOLLERR | EPOLLHUP); // Check `man epoll_ctl` if you don't understand , smile :) - common_mem_rwlock_read_lock (get_fork_lock ()); /* to ensure that there is no fd to create and close when fork. */ + common_mem_rwlock_read_lock (get_fork_lock ()); /* to ensure that there is no fd to create and close when fork. added by tongshaojun t00391048 */ ret = nsep_epctl_add (ep, fd, &ep_event); common_mem_rwlock_read_unlock (get_fork_lock ()); } |