From patchwork Fri May 21 04:30:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eli Schwartz X-Patchwork-Id: 1924 Return-Path: Delivered-To: patchwork@archlinux.org Received: from mail.archlinux.org [95.216.189.61] by patchwork.archlinux.org with IMAP (fetchmail-6.4.19) for (single-drop); Fri, 21 May 2021 04:30:29 +0000 (UTC) Received: from mail.archlinux.org by mail.archlinux.org with LMTP id zFerOmQ3p2CSwwkAK+/4rw (envelope-from ) for ; Fri, 21 May 2021 04:30:28 +0000 Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by mail.archlinux.org (Postfix) with ESMTPS id 7DCEA5CC9D4; Fri, 21 May 2021 04:30:28 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 314A12C70C; Fri, 21 May 2021 04:30:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=lists.archlinux.org; s=luna; t=1621571428; bh=3bMw6ns3OLARuBUcC3bgzVqYlFL42aJLlGH5NfR4vFg=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc; b=oQb5JDshu4A3OYqsTUnvyzGvxOgZ32eVcYiRUzGnI0sTAIFrGtooGCwTrIoKnH/9a h95RFOvGrYZ+f6yIyAMC30IZzq26c8lxrpb21zK+v6H+wRsNwWl3r2H9xfpEFXXqmk LMY9MNwitAT2PskKlVo+G7ZcbMQftoHszdy7ACYHl4uj6qq6tDPJzYoZaaFpmnft/h vM+9ohmzPCAGzqExJez174wb7An1x9TnZE3EHDrajkQcB8sDsTBLIgFb2w1FcfcAC0 qME3Dftn7eGXDhsd4aG8RFDolpSvwjAmGFYl2Bkbpy5sxLXeb4wYAjjKgD2+tvXIp+ UjNvsNrA1QMd9BjrTuk12s+xEarmbX91KHQS8YldVASYWtsDVlmUFA6rl0/a8dHa/m 83w6UvWVtmgh6L3I7TmNQin1uJCqc430KeH+Wa/stdCD5fTKAP7SxnnNdzXIEtCdl9 ULcB4irCQcaP3Ora0dc+tKJ/3TBph/fr8arZRAk0GRhapNOf3GmTHVnhEjykbHX1Nd Xv25DEDkXMMcdQ4sqQzfxVELq/J7lRuokOk+gzt0pCK1i7zyrZVcD3c6wRna8uqow4 EYv8KKRs7NciqrenLEyy3XS/m8lGKYC+PBFwXQBnlMb/fV0caeau5pnCkSFS/tlbkn UXPMDO4dxfQHUzq3ptLrJiJQ= Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id C3F1C2C517 for ; Fri, 21 May 2021 04:30:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on luna.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=DKIMWL_WL_HIGH=-0.39, DKIM_SIGNED=0.1,DKIM_VALID=-0.1,DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3,T_DMARC_POLICY_NONE=0.01 autolearn=failed autolearn_force=no version=3.4.6 X-Spam-BL-Results: [127.0.9.2] Received: from mail.archlinux.org (mail.archlinux.org [IPv6:2a01:4f9:c010:3052::1]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 21 May 2021 04:30:25 +0000 (UTC) To: pacman-contrib@lists.archlinux.org Subject: [pacman-contrib] [PATCH] pactree: fix compilation with pacman 6 Date: Fri, 21 May 2021 00:30:07 -0400 Message-Id: <20210521043007.3657834-1-eschwartz@archlinux.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-BeenThere: pacman-contrib@lists.archlinux.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion list for pacman-contrib development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Eli Schwartz via pacman-contrib From: Eli Schwartz Reply-To: Discussion list for pacman-contrib development Cc: Eli Schwartz Errors-To: pacman-contrib-bounces@lists.archlinux.org Sender: "pacman-contrib" Authentication-Results: mail.archlinux.org; dkim=pass header.d=lists.archlinux.org header.s=luna header.b=oQb5JDsh; dmarc=pass (policy=none) header.from=archlinux.org; spf=pass (mail.archlinux.org: domain of pacman-contrib-bounces@lists.archlinux.org designates 2a01:4f8:160:3033::2 as permitted sender) smtp.mailfrom=pacman-contrib-bounces@lists.archlinux.org X-Rspamd-Queue-Id: 7DCEA5CC9D4 X-Spamd-Result: default: False [-0.11 / 15.00]; HAS_REPLYTO(0.00)[pacman-contrib@lists.archlinux.org]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2a01:4f8:160:3033::2:c]; R_MISSING_CHARSET(2.50)[]; REPLYTO_ADDR_EQ_FROM(0.00)[]; BROKEN_CONTENT_TYPE(1.50)[]; RCVD_DKIM_ARC_DNSWL_MED(-0.50)[]; RCVD_COUNT_THREE(0.00)[4]; MID_RHS_MATCH_FROMTLD(0.00)[]; DKIM_TRACE(0.00)[lists.archlinux.org:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[archlinux.org,none]; RCVD_IN_DNSWL_MED(-0.40)[2a01:4f8:160:3033::2:from,2a01:4f9:c010:3052::1:received]; MAILLIST(-0.20)[mailman]; MIME_TRACE(0.00)[0:+]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE]; FROM_NEQ_ENVFROM(0.00)[pacman-contrib@lists.archlinux.org,pacman-contrib-bounces@lists.archlinux.org]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[lists.archlinux.org:s=luna]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_MED(-2.00)[archlinux.org:dkim]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[pacman-contrib@lists.archlinux.org]; HAS_LIST_UNSUB(-0.01)[]; NEURAL_HAM(-0.00)[-1.000]; FORGED_SENDER_MAILLIST(0.00)[] X-Rspamd-Server: mail.archlinux.org In "add front-end provided context to callbacks", libalpm gained a new argument to callbacks which we don't use and is only needed by some frontends wishing to do stuff with the callback state. NULL it and move on with life, just like pacman itself did. Signed-off-by: Eli Schwartz --- src/pactree.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pactree.c b/src/pactree.c index e8f5086..9e6ac1b 100644 --- a/src/pactree.c +++ b/src/pactree.c @@ -135,8 +135,10 @@ static const char *dbpath = DBPATH; static const char *configfile = CONFFILE; static const char *gpgdir = GPGDIR; -void cb_log(alpm_loglevel_t level, const char *fmt, va_list args) +void cb_log(void *ctx, alpm_loglevel_t level, const char *fmt, va_list args) { + (void)ctx; + switch(level) { case ALPM_LOG_ERROR: fprintf(stderr, "%s%s%s", color->error, "error: ", @@ -621,7 +623,7 @@ int main(int argc, char *argv[]) } if(debug) { - alpm_option_set_logcb(handle, cb_log); + alpm_option_set_logcb(handle, cb_log, NULL); } /* no need to fail on error here */