Skip to content

Commit 83280d4

Browse files
committed
libtrap - fix sending thread cleanup on exit
1 parent 9a39713 commit 83280d4

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

libtrap/src/ifc_tcpip.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,12 +1213,10 @@ send_blocking_mode(void *arg)
12131213
__sync_add_and_fetch(&cl->container_id, 1);
12141214
}
12151215

1216-
pthread_exit(NULL);
1217-
12181216
cleanup:
12191217
disconnect_client(c, cl);
12201218
free(arg);
1221-
return NULL;
1219+
pthread_exit(NULL);
12221220
}
12231221

12241222
static void *
@@ -1314,12 +1312,10 @@ send_non_blocking_mode(void *arg)
13141312
}
13151313
}
13161314

1317-
pthread_exit(NULL);
1318-
13191315
cleanup:
13201316
disconnect_client(c, cl);
13211317
free(arg);
1322-
return NULL;
1318+
pthread_exit(NULL);
13231319
}
13241320

13251321
/**

libtrap/src/ifc_tls.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1351,12 +1351,10 @@ send_blocking_mode(void *arg)
13511351
__sync_add_and_fetch(&cl->container_id, 1);
13521352
}
13531353

1354-
pthread_exit(NULL);
1355-
13561354
cleanup:
13571355
disconnect_client(c, cl);
13581356
free(arg);
1359-
return NULL;
1357+
pthread_exit(NULL);
13601358
}
13611359

13621360
static void *
@@ -1449,12 +1447,10 @@ send_non_blocking_mode(void *arg)
14491447
}
14501448
}
14511449

1452-
pthread_exit(NULL);
1453-
14541450
cleanup:
14551451
disconnect_client(c, cl);
14561452
free(arg);
1457-
return NULL;
1453+
pthread_exit(NULL);
14581454
}
14591455

14601456

0 commit comments

Comments
 (0)