diff options
Diffstat (limited to 'src/nSocket/include')
-rw-r--r-- | src/nSocket/include/nstack_atomic.h | 2 | ||||
-rw-r--r-- | src/nSocket/include/nstack_dmm_api.h | 4 | ||||
-rw-r--r-- | src/nSocket/include/nstack_eventpoll.h | 4 | ||||
-rw-r--r-- | src/nSocket/include/nstack_rd_init.h | 2 | ||||
-rw-r--r-- | src/nSocket/include/nstack_select.h | 2 | ||||
-rw-r--r-- | src/nSocket/include/nstack_sockops.h | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/src/nSocket/include/nstack_atomic.h b/src/nSocket/include/nstack_atomic.h index 37ab451..bb5ec13 100644 --- a/src/nSocket/include/nstack_atomic.h +++ b/src/nSocket/include/nstack_atomic.h @@ -46,7 +46,7 @@ typedef struct #define atomic_add(v, i) atomic_add_and_fetch(v, i) #define atomic_sub(v, i) atomic_sub_and_fetch(v,i) -#define cas(ptr, oldValue, exchage) __sync_bool_compare_and_swap(ptr, oldValue, exchage) +#define cas(ptr, oldValue, exchange) __sync_bool_compare_and_swap(ptr, oldValue, exchange) #ifdef __cplusplus /* *INDENT-OFF* */ diff --git a/src/nSocket/include/nstack_dmm_api.h b/src/nSocket/include/nstack_dmm_api.h index 4caeb5e..481e144 100644 --- a/src/nSocket/include/nstack_dmm_api.h +++ b/src/nSocket/include/nstack_dmm_api.h @@ -40,7 +40,7 @@ typedef struct __nstack_socket_ops typedef enum { STACK_FD_INVALID_CHECK, /*check wether fd is created by this stack */ - STACK_FD_FUNCALL_CHECK, /*check this stack surpport default call */ + STACK_FD_FUNCALL_CHECK, /*check this stack support default call */ } nstack_fd_check; typedef enum @@ -86,7 +86,7 @@ typedef struct __nstack_proc_cb nstack_extern_ops extern_ops; /*other proc callback */ } nstack_proc_cb; -typedef int (*nstack_stack_registe_fn) (nstack_proc_cb * proc_fun, +typedef int (*nstack_stack_register_fn) (nstack_proc_cb * proc_fun, nstack_event_cb * event_ops); #endif diff --git a/src/nSocket/include/nstack_eventpoll.h b/src/nSocket/include/nstack_eventpoll.h index 1abc055..afb0b05 100644 --- a/src/nSocket/include/nstack_eventpoll.h +++ b/src/nSocket/include/nstack_eventpoll.h @@ -81,7 +81,7 @@ struct eventpoll sys_sem_st sem; /* - * This sempaphore is used to block epoll_wait function + * This semaphore is used to block epoll_wait function */ sem_t waitSem; @@ -123,7 +123,7 @@ typedef struct u32 sleepTime; //add for NSTACK_SEM_SLEEP nsep_pidinfo pidinfo; nsfw_res res_chk; - void *private_data; /*add for degbu, just used to record extern infomation, for example sbr conn */ + void *private_data; /*add for debug, just used to record extern infomation, for example sbr conn */ i32 reserv[4]; } nsep_epollInfo_t; diff --git a/src/nSocket/include/nstack_rd_init.h b/src/nSocket/include/nstack_rd_init.h index cf5073e..a8b2e9e 100644 --- a/src/nSocket/include/nstack_rd_init.h +++ b/src/nSocket/include/nstack_rd_init.h @@ -36,7 +36,7 @@ typedef int (*nstack_get_route_data) (rd_route_data ** data, int *num); /* *rd init - *defualtid: if all module check fail, just return defualt id + *default id: if all module check fail, just return default id *return : 0 success, -1 fail */ int nstack_rd_init (nstack_stack_info * pstack, int num, diff --git a/src/nSocket/include/nstack_select.h b/src/nSocket/include/nstack_select.h index bb23105..5c84846 100644 --- a/src/nSocket/include/nstack_select.h +++ b/src/nSocket/include/nstack_select.h @@ -99,7 +99,7 @@ struct select_cb_p struct select_entry_info { i32 set_num; //how many select_c_p is set - i32 index; //the frist cb was set + i32 index; //the first cb was set }; struct select_entry diff --git a/src/nSocket/include/nstack_sockops.h b/src/nSocket/include/nstack_sockops.h index cc430d5..63fefee 100644 --- a/src/nSocket/include/nstack_sockops.h +++ b/src/nSocket/include/nstack_sockops.h @@ -31,7 +31,7 @@ extern "C"{ {\ if((retval = ((ops)->pf##fun args)) == -1)\ {\ - NSSOC_LOGDBG("function=%s excute failed,ret=%d.errno=%d.", #fun, retval, errno); \ + NSSOC_LOGDBG("function=%s execute failed,ret=%d.errno=%d.", #fun, retval, errno); \ }\ }\ else\ |