From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E84D7C4708E for ; Tue, 29 Nov 2022 21:59:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236732AbiK2V6h (ORCPT ); Tue, 29 Nov 2022 16:58:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236942AbiK2V6P (ORCPT ); Tue, 29 Nov 2022 16:58:15 -0500 Received: from kadath.azazel.net (unknown [IPv6:2001:8b0:135f:bcd1:e0cb:4eff:fedf:e608]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 538F76F0E1 for ; Tue, 29 Nov 2022 13:58:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=azazel.net; s=20220717; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=ieYUiwMzqGCMHiktm9MQ0rFPNckn4Ke6RPrvf23nkLA=; b=mGFG8i0EuXneQqE6VKCaoFzdyu 7xMiwJccF5RRErd6aiGXuTx2gU/gbswIUHYB4r/5xwoYVqSLdlonzZOxYTcR0Z6FkKfT/cQmxglAl NoeBuBpWr8Wu+ZHzBFCsBxxn9QFQGd3gUPSmBd2weCZ+oLxitrnaAp7LIqpOgaqD709e6/3O6z/iL QSf28VBtvbwYLADuMLeMtMxXdvho0XJldp22a4ztBu+l0DFu0D6OUVUIvdkB4x17XTgaduMIZ4Lst Ku2okqODrjdKF1Umo2/EV41PccSiOCIRK8dQxHSDWDPqBCbRFgPvnQB7iHHARS6NbTZ57wvNnLxyI N7+Ee6bA==; Received: from ulthar.dreamlands.azazel.net ([2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae]) by kadath.azazel.net with esmtp (Exim 4.94.2) (envelope-from ) id 1p08SK-00DjQp-L2 for netfilter-devel@vger.kernel.org; Tue, 29 Nov 2022 21:47:56 +0000 From: Jeremy Sowden To: Netfilter Devel Subject: [PATCH ulogd2 v2 v2 17/34] db: change return type of two functions to `void` Date: Tue, 29 Nov 2022 21:47:32 +0000 Message-Id: <20221129214749.247878-18-jeremy@azazel.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221129214749.247878-1-jeremy@azazel.net> References: <20221129214749.247878-1-jeremy@azazel.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:8b0:fb7d:d6d7:2e4d:54ff:fe4b:a9ae X-SA-Exim-Mail-From: jeremy@azazel.net X-SA-Exim-Scanned: No (on kadath.azazel.net); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org `_stop_db` and `_loop_reconnect_db` always return successfully. Change the return types and remove error-checking from callers. Signed-off-by: Jeremy Sowden --- util/db.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/util/db.c b/util/db.c index cd9ebef077dd..0514a87e0759 100644 --- a/util/db.c +++ b/util/db.c @@ -43,7 +43,7 @@ static int _interp_db_init(struct ulogd_pluginstance *upi); static int _interp_db_main(struct ulogd_pluginstance *upi); static int _interp_db_disabled(struct ulogd_pluginstance *upi); static int _reconnect_db(struct ulogd_pluginstance *upi); -static int _stop_db(struct ulogd_pluginstance *upi); +static void _stop_db(struct ulogd_pluginstance *upi); static char *_format_key(char *key); static int _create_sql_stmt(struct ulogd_pluginstance *upi); @@ -56,7 +56,7 @@ static int _process_backlog(struct ulogd_pluginstance *upi); static int _add_to_ring(struct ulogd_pluginstance *upi, struct db_instance *di); static void *_process_ring(void *arg); -static int _loop_reconnect_db(struct ulogd_pluginstance *upi); +static void _loop_reconnect_db(struct ulogd_pluginstance *upi); int ulogd_db_configure(struct ulogd_pluginstance *upi, @@ -378,7 +378,7 @@ _reconnect_db(struct ulogd_pluginstance *upi) return 0; } -static int +static void _stop_db(struct ulogd_pluginstance *upi) { struct db_instance *di = (struct db_instance *) upi->private; @@ -397,7 +397,6 @@ _stop_db(struct ulogd_pluginstance *upi) pthread_mutex_destroy(&di->ring.mutex); di->ring.ring = NULL; } - return 0; } static char * @@ -695,14 +694,10 @@ _process_ring(void *gdi) while (*wr_place == RING_QUERY_READY) { if (di->driver->execute(upi, wr_place + 1, strlen(wr_place + 1)) < 0) { - if (_loop_reconnect_db(upi) != 0) { - /* loop has failed on unrecoverable error */ - ulogd_log(ULOGD_ERROR, - "permanently disabling plugin\n"); - di->interp = &_interp_db_disabled; - return NULL; - } else /* try to re run query */ - continue; + _loop_reconnect_db(upi); + /* try to re run query */ + continue; + } *wr_place = RING_NO_QUERY; di->ring.rd_item++; @@ -717,7 +712,7 @@ _process_ring(void *gdi) return NULL; } -static int +static void _loop_reconnect_db(struct ulogd_pluginstance * upi) { struct db_instance *di = (struct db_instance *) &upi->private; @@ -727,8 +722,7 @@ _loop_reconnect_db(struct ulogd_pluginstance * upi) if (di->driver->open_db(upi) < 0) { sleep(1); } else { - return 0; + return; } } - return 0; } -- 2.35.1