From nobody Wed Apr 20 15:52:45 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2D8A811CE7BC; Wed, 20 Apr 2022 15:52:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kk4v16yBpz3vp0; Wed, 20 Apr 2022 15:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650469966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVEgEQDMfYyXP/5Xua/KTLDsxA55gY3RM4p56I/9vHI=; b=si17jQTVT16oQbEuwvxAsdZvgSXUhviEYZQPGZXhxUAv/0UKohIOmqF7oDJhpciQ6r7ugS I7Xi+Qve/VkSRDZjyoW1hjpoNeOMnT/JavykTeCeaBFF3PEwhF4U0vxHA4P3hv1Z/bI+2K 9dF7M/LDwlFD1ANz6sIIgvW7pqPPRjB7+gaDCnR6H2jOQL0h6n4NDjWyV2eSj0V1fMDIu3 PmcMjc7G2joGOdU8UmD3ey3Aqo7XoyubR4bY7lSRxyKBFRFvN5fo8oE+Q7LXQcJ1OAT8HD hHV/N/lFJOxtY0NRkK5UEIxGLGnRyMFz0Ii2VHvAlZcOJVpHU9yrkvE2P0HDqQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CF7E51708B; Wed, 20 Apr 2022 15:52:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23KFqjdo034670; Wed, 20 Apr 2022 15:52:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23KFqjZ5034669; Wed, 20 Apr 2022 15:52:45 GMT (envelope-from git) Date: Wed, 20 Apr 2022 15:52:45 GMT Message-Id: <202204201552.23KFqjZ5034669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alfonso S. Siciliano" Subject: git: b9e5884ef786 - main - bsddialog(3): fix disabled shadow List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asiciliano X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b9e5884ef786a6c0fd203064baa07ef308025707 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650469966; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XVEgEQDMfYyXP/5Xua/KTLDsxA55gY3RM4p56I/9vHI=; b=t07ODENYAz1EDZppAWA9nQSDeal3NMMSMW8XyKrym8mhtUrAr1m5P22FXu+T3FS4QP86tL rFjhKwFeycSvum8FG8Sh+UqtG6FuSQXowmidIPo9TdfQmrXl3516kmeD1ftHVc00rqBviR IuWh5bMXtY2SJRiA2ItpG+AxdulYZKJfzD1TieIPJ+8tyg4HIik+4cvIcAdS9xDw9UzWhG a+bOuHNPLIJrw9lqu7L8QMlq8ppVCJewo09naiH5S0CpmwS0lfC3mU94i54RZ1LHFCQ7T6 I0wtT7UmmURVHTVcSc/lHEyz/yv3hsMnR99S4ZxdxImz0G2sOt+WGkVfEa27xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650469966; a=rsa-sha256; cv=none; b=l7vMrB3ulK+37w3q86HvqKRkMCDMvy6Wim83468HGap84XwagVvW9hbkx+pyrjMhAKDL+P QRMrBxN1fmSB5fZatzE2me4iVrhaMzkt8mjOvhSkDsEF0eW3Y5FjyXz8eF6/pQ6piEdRcE C201kb7fNZsqpSaBgEiossmzLkqWowspzhACZQDtWzDJi2FtWyneZZl4UavKSIiiIEbJ12 9MtMqWrAU7rJB58yL0pz8O2O1JjVIxbMU04CR8ZfMNmVteRPulTTIkm1wRKamg+WXbuZBK 5z5WPKZyEr3qZed/zkN7uUdL41NvlgY6LIfoWrtUJqm6PEiOso4LbqsGM8SNLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asiciliano: URL: https://cgit.FreeBSD.org/src/commit/?id=b9e5884ef786a6c0fd203064baa07ef308025707 commit b9e5884ef786a6c0fd203064baa07ef308025707 Author: Alfonso S. Siciliano AuthorDate: 2022-04-20 15:39:43 +0000 Commit: Alfonso S. Siciliano CommitDate: 2022-04-20 15:52:04 +0000 bsddialog(3): fix disabled shadow Fix dialogs building and updating fault with disabled shadow (conf.shadow=false and implicitly bsddialog --no-shadow). While here delete WARNS=2: all warnings were fixed in upstream and imported in 0.2. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D34958 --- contrib/bsddialog/lib/lib_util.c | 6 +++--- lib/libbsddialog/Makefile | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/contrib/bsddialog/lib/lib_util.c b/contrib/bsddialog/lib/lib_util.c index 4c2ab76bc592..643830efd58c 100644 --- a/contrib/bsddialog/lib/lib_util.c +++ b/contrib/bsddialog/lib/lib_util.c @@ -823,7 +823,7 @@ draw_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget, getmaxyx(widget, h, w); - if (shadow != NULL) + if (conf->shadow) wnoutrefresh(shadow); draw_borders(conf, widget, h, w, RAISED); @@ -883,7 +883,7 @@ update_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget, { int error; - if (shadow != NULL) { + if (conf->shadow) { wclear(shadow); mvwin(shadow, y + t.shadow.h, x + t.shadow.w); wresize(shadow, h, w); @@ -962,7 +962,7 @@ end_dialog(struct bsddialog_conf *conf, WINDOW *shadow, WINDOW *widget, delwin(shadow); if (conf->clear) - hide_widget(y, x, h, w, shadow != NULL); + hide_widget(y, x, h, w, conf->shadow); if (conf->get_height != NULL) *conf->get_height = h; diff --git a/lib/libbsddialog/Makefile b/lib/libbsddialog/Makefile index d5c03cb079ce..08e5bebcb6a5 100644 --- a/lib/libbsddialog/Makefile +++ b/lib/libbsddialog/Makefile @@ -24,6 +24,4 @@ MAN= bsddialog.3 LIBADD= ncursesw tinfow formw CFLAGS+= -D_XOPEN_SOURCE_EXTENDED -WARNS= 2 - .include