mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -09:00
97c434f731
0.5.11: https://sourceforge.net/p/c-icap/mailman/message/38634903/ 0.5.12: https://sourceforge.net/p/c-icap/mailman/message/58723532/ 0.5.13: https://github.com/c-icap/c-icap-server/compare/C_ICAP_0.5.12...C_ICAP_0.5.13 (no announcement found) 0.5.14: https://sourceforge.net/p/c-icap/mailman/message/59202148/ Rebased patch 0001 due to upstream commit1559d1662aRebased patch 0003 due to upstream commitb650bfdd4aRemoved patch 0004 which is included in this release:16cdaa505dRenamed patches 0005 & 0006. Disabled zstd support added upstream with commit1559d1662adue to build errors when enabled: encode.c: In function 'ci_compress_to_membuf': encode.c:75:16: error: implicit declaration of function 'ci_zstd_compress_to_membuf'; did you mean 'ci_decompress_to_membuf'? [-Wimplicit-function-declaration] Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Julien Olivain <ju.o@free.fr>
48 lines
2.3 KiB
Diff
48 lines
2.3 KiB
Diff
From 8ef8966237865ec699ab16d208ff56edaac4ff7b Mon Sep 17 00:00:00 2001
|
|
From: Christos Tsantilas <christos@chtsanti.net>
|
|
Date: Fri, 1 Nov 2019 08:00:52 -0700
|
|
Subject: [PATCH] Fix integer printing in various printf to avoid warnings
|
|
about integer sizes
|
|
|
|
Upstream: https://github.com/c-icap/c-icap-server/commit/8ef8966237865ec699ab16d208ff56edaac4ff7b
|
|
|
|
[Bernd: partially backported to 0.5.10]
|
|
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
|
|
---
|
|
mpmt_server.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/mpmt_server.c b/mpmt_server.c
|
|
index a30d55d4..9b178a66 100644
|
|
--- a/mpmt_server.c
|
|
+++ b/mpmt_server.c
|
|
@@ -74,7 +74,7 @@ typedef struct server_decl {
|
|
|
|
ci_thread_mutex_t threads_list_mtx;
|
|
server_decl_t **threads_list = NULL;
|
|
-ci_thread_t listener_thread_id = -1;
|
|
+ci_thread_t listener_thread_id;
|
|
int listener_running = 0;
|
|
|
|
ci_thread_cond_t free_server_cond;
|
|
@@ -242,8 +242,8 @@ static void cancel_all_threads()
|
|
for (i=0; i<CI_CONF.THREADS_PER_CHILD; i++) {
|
|
if (threads_list[i] != NULL) { /* if the i thread is still alive*/
|
|
if (!threads_list[i]->running) { /*if the i thread is not running any more*/
|
|
- ci_debug_printf(5, "Cancel server %d, thread_id %lu (%d)\n",
|
|
- threads_list[i]->srv_id, threads_list[i]->srv_pthread,
|
|
+ ci_debug_printf(5, "Cancel server %" PRIu64 ", thread_id %" PRIu64 " (%d)\n",
|
|
+ (uint64_t)threads_list[i]->srv_id, (uint64_t)threads_list[i]->srv_pthread,
|
|
i);
|
|
ci_thread_join(threads_list[i]->srv_pthread);
|
|
release_thread_i(i);
|
|
@@ -252,7 +252,7 @@ static void cancel_all_threads()
|
|
/*The thread is still running, and we have a timeout for waiting
|
|
the thread to exit. */
|
|
if (wait_for_workers <= 2) {
|
|
- ci_debug_printf(5, "Thread %ld still running near the timeout. Try to kill it\n", threads_list[i]->srv_pthread);
|
|
+ ci_debug_printf(5, "Thread %" PRIu64 " still running near the timeout. Try to kill it\n", (uint64_t)threads_list[i]->srv_pthread);
|
|
pthread_kill( threads_list[i]->srv_pthread, SIGTERM);
|
|
}
|
|
}
|