From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Konstantin Kharlamov Newsgroups: gmane.emacs.bugs Subject: bug#35062: [PATCH 3/4] min_cols/rows is always 0, don't check for it Date: Mon, 1 Apr 2019 01:37:41 +0300 Message-ID: <20190331223742.1351-4-Hi-Angel@yandex.ru> References: <20190331223742.1351-1-Hi-Angel@yandex.ru> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="150594"; mail-complaints-to="usenet@blaine.gmane.org" To: 35062@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Apr 01 00:38:23 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hAj5q-000d4L-DN for geb-bug-gnu-emacs@m.gmane.org; Mon, 01 Apr 2019 00:38:22 +0200 Original-Received: from localhost ([127.0.0.1]:35568 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAj5p-0006wS-BP for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Mar 2019 18:38:21 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:32828) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hAj5a-0006tx-De for bug-gnu-emacs@gnu.org; Sun, 31 Mar 2019 18:38:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hAj5Z-0001kK-IB for bug-gnu-emacs@gnu.org; Sun, 31 Mar 2019 18:38:06 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:53293) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hAj5Z-0001jv-AE for bug-gnu-emacs@gnu.org; Sun, 31 Mar 2019 18:38:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hAj5Z-0006nf-5t for bug-gnu-emacs@gnu.org; Sun, 31 Mar 2019 18:38:05 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Konstantin Kharlamov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 31 Mar 2019 22:38:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35062 X-GNU-PR-Package: emacs Original-Received: via spool by 35062-submit@debbugs.gnu.org id=B35062.155407188326099 (code B ref 35062); Sun, 31 Mar 2019 22:38:05 +0000 Original-Received: (at 35062) by debbugs.gnu.org; 31 Mar 2019 22:38:03 +0000 Original-Received: from localhost ([127.0.0.1]:38597 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hAj5W-0006mj-ML for submit@debbugs.gnu.org; Sun, 31 Mar 2019 18:38:02 -0400 Original-Received: from forward103o.mail.yandex.net ([37.140.190.177]:50831) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hAj5S-0006lj-Jp for 35062@debbugs.gnu.org; Sun, 31 Mar 2019 18:37:59 -0400 Original-Received: from mxback5o.mail.yandex.net (mxback5o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1f]) by forward103o.mail.yandex.net (Yandex) with ESMTP id 049115F80221 for <35062@debbugs.gnu.org>; Mon, 1 Apr 2019 01:37:52 +0300 (MSK) Original-Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback5o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id ez0um5Lc1m-bp7eO44Y; Mon, 01 Apr 2019 01:37:51 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1554071872; bh=aQ0dOBYQkxCtAo2CUcProggMKHW6gq5Bezk3C8Sme4E=; h=In-Reply-To:Subject:To:From:References:Date:Message-Id; b=eOGJ97gUabOC35c3/29rt40FvFyBe0GL5PPl9lEmwzQJJrHbRyPN9F8IUyLnWGEa/ e47P+xyzL210qUfwBT7APTJdhSGQ8UsMSbzspOWEsvgBaTJYEIee7mWSu8BtEWOzGC AsPjwFGPbz1Bvk0hkPwvPfIhVXj7ZWbR0psC4vO0= Authentication-Results: mxback5o.mail.yandex.net; dkim=pass header.i=@yandex.ru Original-Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id XiGbwCpRwI-bp6uJh02; Mon, 01 Apr 2019 01:37:51 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client certificate not present) X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190331223742.1351-1-Hi-Angel@yandex.ru> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:156993 Archived-At: * src/gtkutil.c: remove unnecessary comparison Fixes LGTM warnings: * Comparison is always false because min_cols <= 0. * Comparison is always false because min_rows <= 0. --- src/gtkutil.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/gtkutil.c b/src/gtkutil.c index 4bd73b1a6d1..64bc248d650 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1401,7 +1401,7 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position) GdkGeometry size_hints; gint hint_flags = 0; int base_width, base_height; - int min_rows = 0, min_cols = 0; + const int min_rows = 0, min_cols = 0; int win_gravity = f->win_gravity; Lisp_Object fs_state, frame; int scale = xg_get_scale (f); @@ -1450,9 +1450,6 @@ x_wm_set_size_hint (struct frame *f, long int flags, bool user_position) base_height = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, 1) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); - if (min_cols > 0) --min_cols; /* We used one col in base_width = ... 1); */ - if (min_rows > 0) --min_rows; /* We used one row in base_height = ... 1); */ - size_hints.base_width = base_width; size_hints.base_height = base_height; size_hints.min_width = base_width + min_cols * FRAME_COLUMN_WIDTH (f); -- 2.21.0