libtrap - fix sending thread cleanup on exit

CESNET · Sep 16, 2024 · 83280d4 · 83280d4
1 parent 9a39713
commit 83280d4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/libtrap/src/ifc_tcpip.c b/libtrap/src/ifc_tcpip.c
@@ -1213,12 +1213,10 @@ send_blocking_mode(void *arg)
       __sync_add_and_fetch(&cl->container_id, 1);
    }
 
-   pthread_exit(NULL);
-
 cleanup:
    disconnect_client(c, cl);
    free(arg);
-   return NULL;
+   pthread_exit(NULL);
 }
 
 static void *
@@ -1314,12 +1312,10 @@ send_non_blocking_mode(void *arg)
       }
    }
 
-   pthread_exit(NULL);
-
 cleanup:
    disconnect_client(c, cl);
    free(arg);
-   return NULL;
+   pthread_exit(NULL);
 }
 
 /**

diff --git a/libtrap/src/ifc_tls.c b/libtrap/src/ifc_tls.c
@@ -1351,12 +1351,10 @@ send_blocking_mode(void *arg)
       __sync_add_and_fetch(&cl->container_id, 1);
    }
 
-   pthread_exit(NULL);
-
 cleanup:
    disconnect_client(c, cl);
    free(arg);
-   return NULL;
+   pthread_exit(NULL);
 }
 
 static void *
@@ -1449,12 +1447,10 @@ send_non_blocking_mode(void *arg)
       }
    }
 
-   pthread_exit(NULL);
-
 cleanup:
    disconnect_client(c, cl);
    free(arg);
-   return NULL;
+   pthread_exit(NULL);
 }