From 371b2c984cf43163afb16ff15f9d2fa1d3eb96fb Mon Sep 17 00:00:00 2001 From: cvs Date: Sat, 1 Jul 2023 14:31:39 +0000 Subject: [PATCH 1/7] - clean warning with -no-blowfish --- src/dinoex_jobs.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dinoex_jobs.c b/src/dinoex_jobs.c index b4dabb8f..32faef8c 100644 --- a/src/dinoex_jobs.c +++ b/src/dinoex_jobs.c @@ -354,7 +354,9 @@ vprivmsg_chan(channel_t * const ch, const char *format, va_list ap) { char tempstr[maxtextlength]; ssize_t len; +#ifndef WITHOUT_BLOWFISH size_t ulen; +#endif /* WITHOUT_BLOWFISH */ if (ch == NULL) return; if (!ch->name) return; From 90a06217bc784860220383454f6d9aa242c9203f Mon Sep 17 00:00:00 2001 From: cvs Date: Sat, 1 Jul 2023 14:35:52 +0000 Subject: [PATCH 2/7] - make sure retval is initialized --- src/iroffer_utilities.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/iroffer_utilities.c b/src/iroffer_utilities.c index 49036ff6..8964593e 100644 --- a/src/iroffer_utilities.c +++ b/src/iroffer_utilities.c @@ -2266,7 +2266,7 @@ int ir_boutput_attempt_flush(ir_boutput_t *bout) while ((segment = irlist_get_head(&bout->segments))) { - int retval; + int retval = 0; assert(segment->begin <= segment->end); assert(segment->begin <= IR_BOUTPUT_SEGMENT_SIZE); From f60930eaa37d290acc056264984f2957940cc18d Mon Sep 17 00:00:00 2001 From: cvs Date: Sat, 1 Jul 2023 14:39:17 +0000 Subject: [PATCH 3/7] - drop HAVE_MMAP, ruby uses it own definition --- src/dinoex_ruby.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/dinoex_ruby.c b/src/dinoex_ruby.c index 938170fc..715e55da 100644 --- a/src/dinoex_ruby.c +++ b/src/dinoex_ruby.c @@ -42,6 +42,7 @@ #pragma GCC diagnostic ignored "-Wgcc-compat" #pragma GCC diagnostic ignored "-Wgnu-zero-variadic-macro-arguments" #endif +#undef HAVE_MMAP #include "ruby.h" #if USE_RUBYVERSION < 19 #ifndef RSTRING_PTR From da7b7f6bbc71b1a026b14fc97a424951fd85f5ca Mon Sep 17 00:00:00 2001 From: cvs Date: Sat, 1 Jul 2023 14:40:31 +0000 Subject: [PATCH 4/7] - silence warning with -no-openssl --- src/dinoex_chat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/dinoex_chat.c b/src/dinoex_chat.c index 81906118..991888fa 100644 --- a/src/dinoex_chat.c +++ b/src/dinoex_chat.c @@ -309,7 +309,9 @@ static void chat_accept(dccchat_t *chat) { SIGNEDSOCK int addrlen; char *msg; +#if defined(USE_OPENSSL) || defined(USE_GNUTLS) int flags = 0; +#endif /* USE_OPENSSL or USE_GNUTLS */ updatecontext(); From 7831c3c3d90e6529ab6154a340bae230daf80d18 Mon Sep 17 00:00:00 2001 From: cvs Date: Sat, 1 Jul 2023 14:57:16 +0000 Subject: [PATCH 5/7] - revert -no-blowfish --- src/dinoex_jobs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/dinoex_jobs.c b/src/dinoex_jobs.c index 32faef8c..b4dabb8f 100644 --- a/src/dinoex_jobs.c +++ b/src/dinoex_jobs.c @@ -354,9 +354,7 @@ vprivmsg_chan(channel_t * const ch, const char *format, va_list ap) { char tempstr[maxtextlength]; ssize_t len; -#ifndef WITHOUT_BLOWFISH size_t ulen; -#endif /* WITHOUT_BLOWFISH */ if (ch == NULL) return; if (!ch->name) return; From dfc010afdfff8cfb5ad03fd915888ed79d06ec74 Mon Sep 17 00:00:00 2001 From: cvs Date: Sat, 1 Jul 2023 15:03:38 +0000 Subject: [PATCH 6/7] - tag Copyright --- src/dinoex_admin.c | 4 ++-- src/dinoex_chat.c | 4 ++-- src/dinoex_config.c | 4 ++-- src/dinoex_curl.c | 4 ++-- src/dinoex_http.c | 4 ++-- src/dinoex_jobs.c | 4 ++-- src/dinoex_ruby.c | 4 ++-- src/dinoex_utilities.c | 4 ++-- src/iroffer_utilities.c | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/dinoex_admin.c b/src/dinoex_admin.c index ec862fee..d2e5fd1e 100644 --- a/src/dinoex_admin.c +++ b/src/dinoex_admin.c @@ -1,6 +1,6 @@ /* * by Dirk Meyer (dinoex) - * Copyright (C) 2004-2021 Dirk Meyer + * Copyright (C) 2004-2023 Dirk Meyer * * By using this file, you agree to the terms and conditions set * forth in the GNU General Public License. More information is @@ -9,7 +9,7 @@ * If you received this file without documentation, it can be * downloaded from https://iroffer.net/ * - * SPDX-FileCopyrightText: 2004-2021 Dirk Meyer + * SPDX-FileCopyrightText: 2004-2023 Dirk Meyer * SPDX-License-Identifier: GPL-2.0-only * * $Id$ diff --git a/src/dinoex_chat.c b/src/dinoex_chat.c index 991888fa..b36f83a6 100644 --- a/src/dinoex_chat.c +++ b/src/dinoex_chat.c @@ -1,6 +1,6 @@ /* * by Dirk Meyer (dinoex) - * Copyright (C) 2004-2021 Dirk Meyer + * Copyright (C) 2004-2023 Dirk Meyer * * By using this file, you agree to the terms and conditions set * forth in the GNU General Public License. More information is @@ -9,7 +9,7 @@ * If you received this file without documentation, it can be * downloaded from https://iroffer.net/ * - * SPDX-FileCopyrightText: 2004-2021 Dirk Meyer + * SPDX-FileCopyrightText: 2004-2023 Dirk Meyer * SPDX-License-Identifier: GPL-2.0-only * * $Id$ diff --git a/src/dinoex_config.c b/src/dinoex_config.c index 45b460bc..9d18e655 100644 --- a/src/dinoex_config.c +++ b/src/dinoex_config.c @@ -1,6 +1,6 @@ /* * by Dirk Meyer (dinoex) - * Copyright (C) 2004-2022 Dirk Meyer + * Copyright (C) 2004-2023 Dirk Meyer * * By using this file, you agree to the terms and conditions set * forth in the GNU General Public License. More information is @@ -9,7 +9,7 @@ * If you received this file without documentation, it can be * downloaded from https://iroffer.net/ * - * SPDX-FileCopyrightText: 2004-2021 Dirk Meyer + * SPDX-FileCopyrightText: 2004-2023 Dirk Meyer * SPDX-License-Identifier: GPL-2.0-only * * $Id$ diff --git a/src/dinoex_curl.c b/src/dinoex_curl.c index 3b58e405..244f94ef 100644 --- a/src/dinoex_curl.c +++ b/src/dinoex_curl.c @@ -1,6 +1,6 @@ /* * by Dirk Meyer (dinoex) - * Copyright (C) 2004-2021 Dirk Meyer + * Copyright (C) 2004-2023 Dirk Meyer * * By using this file, you agree to the terms and conditions set * forth in the GNU General Public License. More information is @@ -9,7 +9,7 @@ * If you received this file without documentation, it can be * downloaded from https://iroffer.net/ * - * SPDX-FileCopyrightText: 2004-2021 Dirk Meyer + * SPDX-FileCopyrightText: 2004-2023 Dirk Meyer * SPDX-License-Identifier: GPL-2.0-only * * $Id$ diff --git a/src/dinoex_http.c b/src/dinoex_http.c index f3f5e6bf..9231716e 100644 --- a/src/dinoex_http.c +++ b/src/dinoex_http.c @@ -1,6 +1,6 @@ /* * by Dirk Meyer (dinoex) - * Copyright (C) 2004-2021 Dirk Meyer + * Copyright (C) 2004-2023 Dirk Meyer * * By using this file, you agree to the terms and conditions set * forth in the GNU General Public License. More information is @@ -9,7 +9,7 @@ * If you received this file without documentation, it can be * downloaded from https://iroffer.net/ * - * SPDX-FileCopyrightText: 2004-2021 Dirk Meyer + * SPDX-FileCopyrightText: 2004-2023 Dirk Meyer * SPDX-License-Identifier: GPL-2.0-only * * $Id$ diff --git a/src/dinoex_jobs.c b/src/dinoex_jobs.c index b4dabb8f..344c4e20 100644 --- a/src/dinoex_jobs.c +++ b/src/dinoex_jobs.c @@ -1,6 +1,6 @@ /* * by Dirk Meyer (dinoex) - * Copyright (C) 2004-2021 Dirk Meyer + * Copyright (C) 2004-2023 Dirk Meyer * * By using this file, you agree to the terms and conditions set * forth in the GNU General Public License. More information is @@ -9,7 +9,7 @@ * If you received this file without documentation, it can be * downloaded from https://iroffer.net/ * - * SPDX-FileCopyrightText: 2004-2021 Dirk Meyer + * SPDX-FileCopyrightText: 2004-2023 Dirk Meyer * SPDX-License-Identifier: GPL-2.0-only * * $Id$ diff --git a/src/dinoex_ruby.c b/src/dinoex_ruby.c index 715e55da..7c9ec670 100644 --- a/src/dinoex_ruby.c +++ b/src/dinoex_ruby.c @@ -1,6 +1,6 @@ /* * by Dirk Meyer (dinoex) - * Copyright (C) 2004-2021 Dirk Meyer + * Copyright (C) 2004-2023 Dirk Meyer * * By using this file, you agree to the terms and conditions set * forth in the GNU General Public License. More information is @@ -9,7 +9,7 @@ * If you received this file without documentation, it can be * downloaded from https://iroffer.net/ * - * SPDX-FileCopyrightText: 2004-2021 Dirk Meyer + * SPDX-FileCopyrightText: 2004-2023 Dirk Meyer * SPDX-License-Identifier: GPL-2.0-only * * $Id$ diff --git a/src/dinoex_utilities.c b/src/dinoex_utilities.c index 4b8de506..891afc90 100644 --- a/src/dinoex_utilities.c +++ b/src/dinoex_utilities.c @@ -1,6 +1,6 @@ /* * by Dirk Meyer (dinoex) - * Copyright (C) 2004-2021 Dirk Meyer + * Copyright (C) 2004-2023 Dirk Meyer * * By using this file, you agree to the terms and conditions set * forth in the GNU General Public License. More information is @@ -9,7 +9,7 @@ * If you received this file without documentation, it can be * downloaded from https://iroffer.net/ * - * SPDX-FileCopyrightText: 2004-2021 Dirk Meyer + * SPDX-FileCopyrightText: 2004-2023 Dirk Meyer * SPDX-License-Identifier: GPL-2.0-only * * $Id$ diff --git a/src/iroffer_utilities.c b/src/iroffer_utilities.c index 8964593e..ee3bd2ce 100644 --- a/src/iroffer_utilities.c +++ b/src/iroffer_utilities.c @@ -10,7 +10,7 @@ * downloaded from http://iroffer.org/ * * SPDX-FileCopyrightText: 1998-2005 David Johnson - * SPDX-FileCopyrightText: 2004-2021 Dirk Meyer + * SPDX-FileCopyrightText: 2004-2023 Dirk Meyer * SPDX-License-Identifier: GPL-2.0-only * * @(#) iroffer_utilities.c 1.205@(#) From 54582d9e3976e231a808bed5ffdcf2954f63d522 Mon Sep 17 00:00:00 2001 From: cvs Date: Sat, 1 Jul 2023 15:17:46 +0000 Subject: [PATCH 7/7] - add Trace --- de.txt | 1 + en.txt | 1 + fr.txt | 1 + it.txt | 1 + 4 files changed, 4 insertions(+) diff --git a/de.txt b/de.txt index 23204150..9c74d96d 100644 --- a/de.txt +++ b/de.txt @@ -1808,3 +1808,4 @@ 2844 "XDCCS" 2845 "[options]" 2846 " Waiting for SSL handshake." +2847 "Trace %3d %-20s %-16s:%5u %lu.%06lu" diff --git a/en.txt b/en.txt index e6dbcc5a..57b42ef5 100644 --- a/en.txt +++ b/en.txt @@ -1808,3 +1808,4 @@ 2844 "XDCCS" 2845 "[options]" 2846 " Waiting for SSL handshake." +2847 "Trace %3d %-20s %-16s:%5u %lu.%06lu" diff --git a/fr.txt b/fr.txt index 738a792d..94004caa 100644 --- a/fr.txt +++ b/fr.txt @@ -1808,3 +1808,4 @@ 2844 "XDCCS" 2845 "[options]" 2846 " Waiting for SSL handshake." +2847 "Trace %3d %-20s %-16s:%5u %lu.%06lu" diff --git a/it.txt b/it.txt index 7b4c2d46..2dea4218 100644 --- a/it.txt +++ b/it.txt @@ -1808,3 +1808,4 @@ 2844 "XDCCS" 2845 "[options]" 2846 " Waiting for SSL handshake." +2847 "Trace %3d %-20s %-16s:%5u %lu.%06lu"