Add comments, rename our struct http_data h to cookie, all clientsockets to sock, all size_t from socket_recvs to byte_count. Make signal handler set default handler for the second SIGINT

1 files changed, 9 insertions, 9 deletions

diff --git a/ot_mutex.c b/ot_mutex.c
index 36de5ff..2ed5e81 100644
--- a/ot_mutex.c
+++ b/ot_mutex.c
@@ -113,7 +113,7 @@ size_t mutex_get_torrent_count( ) {
 struct ot_task {
   ot_taskid       taskid;
   ot_tasktype     tasktype;
-  int64           socket;
+  int64           sock;
   int             iovec_entries;
   struct iovec   *iovec;
   struct ot_task *next;
@@ -124,7 +124,7 @@ static struct ot_task *tasklist = NULL;
 static pthread_mutex_t tasklist_mutex;
 static pthread_cond_t tasklist_being_filled;
 
-int mutex_workqueue_pushtask( int64 socket, ot_tasktype tasktype ) {
+int mutex_workqueue_pushtask( int64 sock, ot_tasktype tasktype ) {
   struct ot_task ** tmptask, * task;
 
   /* Want exclusive access to tasklist */
@@ -148,7 +148,7 @@ int mutex_workqueue_pushtask( int64 socket, ot_tasktype tasktype ) {
 
   task->taskid        = 0;
   task->tasktype      = tasktype;
-  task->socket        = socket;
+  task->sock          = sock;
   task->iovec_entries = 0;
   task->iovec         = NULL;
   task->next          = 0;
@@ -162,7 +162,7 @@ int mutex_workqueue_pushtask( int64 socket, ot_tasktype tasktype ) {
   return 0;
 }
 
-void mutex_workqueue_canceltask( int64 socket ) {
+void mutex_workqueue_canceltask( int64 sock ) {
   struct ot_task ** task;
 
   /* Want exclusive access to tasklist */
@@ -171,10 +171,10 @@ void mutex_workqueue_canceltask( int64 socket ) {
   MTX_DBG( "canceltask locked.\n" );
 
   task = &tasklist;
-  while( *task && ( (*task)->socket != socket ) )
+  while( *task && ( (*task)->sock != sock ) )
     *task = (*task)->next;
 
-  if( *task && ( (*task)->socket == socket ) ) {
+  if( *task && ( (*task)->sock == sock ) ) {
     struct iovec *iovec = (*task)->iovec;
     struct ot_task *ptask = *task;
     int i;
@@ -281,7 +281,7 @@ int mutex_workqueue_pushresult( ot_taskid taskid, int iovec_entries, struct iove
 
 int64 mutex_workqueue_popresult( int *iovec_entries, struct iovec ** iovec ) {
   struct ot_task ** task;
-  int64 socket = -1;
+  int64 sock = -1;
 
   /* Want exclusive access to tasklist */
   MTX_DBG( "popresult locks.\n" );
@@ -297,7 +297,7 @@ int64 mutex_workqueue_popresult( int *iovec_entries, struct iovec ** iovec ) {
 
     *iovec_entries = (*task)->iovec_entries;
     *iovec         = (*task)->iovec;
-    socket         = (*task)->socket;
+    sock           = (*task)->sock;
 
     *task = (*task)->next;
     free( ptask );
@@ -307,7 +307,7 @@ int64 mutex_workqueue_popresult( int *iovec_entries, struct iovec ** iovec ) {
   MTX_DBG( "popresult unlocks.\n" );
   pthread_mutex_unlock( &tasklist_mutex );
   MTX_DBG( "popresult unlocked.\n" );
-  return socket;
+  return sock;
 }
 
 void mutex_init( ) {