From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: dick Newsgroups: gmane.emacs.bugs Subject: bug#52276: 28.0.50; [PATCH] Scuttle compiler warning in image.c Date: Sat, 04 Dec 2021 07:35:34 -0500 Message-ID: <87r1asv97t.fsf@dick> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9834"; mail-complaints-to="usenet@ciao.gmane.io" To: 52276@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Dec 04 13:48:58 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mtUTJ-0002JL-Md for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 04 Dec 2021 13:48:57 +0100 Original-Received: from localhost ([::1]:38068 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mtUTI-0000jZ-JD for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 04 Dec 2021 07:48:56 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:43282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mtUGo-0002gr-Eb for bug-gnu-emacs@gnu.org; Sat, 04 Dec 2021 07:36:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41512) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mtUGo-0003p1-84 for bug-gnu-emacs@gnu.org; Sat, 04 Dec 2021 07:36:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mtUGo-0004fl-1E for bug-gnu-emacs@gnu.org; Sat, 04 Dec 2021 07:36:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: dick Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 04 Dec 2021 12:36:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 52276 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs Original-Received: via spool by submit@debbugs.gnu.org id=B.163862135517946 (code B ref -1); Sat, 04 Dec 2021 12:36:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 4 Dec 2021 12:35:55 +0000 Original-Received: from localhost ([127.0.0.1]:53058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtUGg-0004fN-H0 for submit@debbugs.gnu.org; Sat, 04 Dec 2021 07:35:55 -0500 Original-Received: from lists.gnu.org ([209.51.188.17]:58860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mtUGe-0004fG-O2 for submit@debbugs.gnu.org; Sat, 04 Dec 2021 07:35:53 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:43256) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mtUGc-0002cF-R7 for bug-gnu-emacs@gnu.org; Sat, 04 Dec 2021 07:35:52 -0500 Original-Received: from [2607:f8b0:4864:20::72c] (port=34718 helo=mail-qk1-x72c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mtUGP-0003n1-K4 for bug-gnu-emacs@gnu.org; Sat, 04 Dec 2021 07:35:50 -0500 Original-Received: by mail-qk1-x72c.google.com with SMTP id t6so6434078qkg.1 for ; Sat, 04 Dec 2021 04:35:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version; bh=DnEJ3IxtozC5D5WUqJn3aq7f1NIlZvPMFFXeymv/H7w=; b=VGD+OcelBfpjf1sTeNtgPwA+ngLRELFfec6MYNqAtG92wvfa1tZEU2JgkBwnkWau5n Iwv4iL4Bf/OU63zTE50ldbPrc8T5aKxUgK7Rv5djnuM1QHXysG5gGiwClYU+DYZj5W3J isemDE5t05bM7XTNSYNGPeWCKfVHNY2iZCZBqyZUUM1m2rBJbaCAlrXqX0M3BFM7SjAz G6mybGOMEhKmdNTME7mJWHANdxhk/Hyoy24t9k2jzFWQKsnyHXqHDREozTWA7GeDAJYe 97m3o+RlOqxrLPU/+c5F8/Zz1/OXkRDqjzhiEaq41u7vF08xUUpg7nFAcj+iCnuxE1fF tVyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=DnEJ3IxtozC5D5WUqJn3aq7f1NIlZvPMFFXeymv/H7w=; b=dOSlKK0SDPAyAYUcCraxboE0bmXXxDz5NMftazVfre1zswpCJn32labx9jSG3vaRSS DlFE2EfR21pDXx2/pS4TmutRsbUTIY8iBT4Si7HdVwwz7YxRUAJeIfchCrQtMKbPAb0s FIg6G/44NYT9pWg+0/CK5DyEkqpByha5qFmKemje81gnOw0/2rQ2pepf8eT/sTuXD5zr FMYAv0bsDZU20vQ2oWtIOfsVlHNeJlEsl+w4aH45H0byymOx+MmZHL/g/LJGq+t8TDCj rKfX+B/AsDetIApVVriuvMHC4WjTZftqe1i7U+KigVfdwB/PXt0HqFarZxmMtqgVJafx jZmg== X-Gm-Message-State: AOAM530JbGUKHIYVrU9gBwxD7bb4g7as9f9DlZ1PRVkgjordFx8k2Oox yfxyjJJPQ3IZm3RwRkW278nU7gu7h1A= X-Google-Smtp-Source: ABdhPJzYwW+LnJ9h5di78ofVy58+f96I+xeeH3QRYq6A2Nh0J7+RrMpSUKDjRpl0YICvDRrWFDF2bg== X-Received: by 2002:a05:620a:2229:: with SMTP id n9mr22653928qkh.155.1638621335720; Sat, 04 Dec 2021 04:35:35 -0800 (PST) Original-Received: from localhost ([68.237.93.126]) by smtp.gmail.com with ESMTPSA id m20sm4196230qkp.112.2021.12.04.04.35.34 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 04 Dec 2021 04:35:35 -0800 (PST) X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::72c (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::72c; envelope-from=dick.r.chiang@gmail.com; helo=mail-qk1-x72c.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, PDS_HP_HELO_NORDNS=0.001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:221465 Archived-At: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Scuttle-a-compiler-warning-under-enable-checking.patch >From 2f1a3475910bfea5d0c0ead874a238db3ecbf3ad Mon Sep 17 00:00:00 2001 From: dickmao Date: Sat, 4 Dec 2021 07:32:00 -0500 Subject: [PATCH] Scuttle a compiler warning under --enable-checking * src/image.c (webp_load): Scuttle compiler warning. --- src/image.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/image.c b/src/image.c index b85c405487..709abc21aa 100644 --- a/src/image.c +++ b/src/image.c @@ -8970,7 +8970,7 @@ webp_load (struct frame *f, struct image *img) { ptrdiff_t size = 0; uint8_t *contents; - Lisp_Object file; + Lisp_Object file = Qnil; /* Open the WebP file. */ Lisp_Object specified_file = image_spec_value (img->spec, QCfile, NULL); @@ -9007,7 +9007,7 @@ webp_load (struct frame *f, struct image *img) /* Validate the WebP image header. */ if (!WebPGetInfo (contents, size, NULL, NULL)) { - if (NILP (specified_data)) + if (! NILP (file)) image_error ("Not a WebP file: `%s'", file); else image_error ("Invalid header in WebP image data"); @@ -9030,7 +9030,7 @@ webp_load (struct frame *f, struct image *img) case VP8_STATUS_USER_ABORT: default: /* Error out in all other cases. */ - if (NILP (specified_data)) + if (! NILP (file)) image_error ("Error when interpreting WebP image data: `%s'", file); else image_error ("Error when interpreting WebP image data"); -- 2.26.2 --=-=-= Content-Type: text/plain In Commercial Emacs 28.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.22.30, cairo version 1.15.10) of 2021-12-04 built on dick Repository revision: 496cf662a994ab288a4fb75f70ceb053af27a2a9 Repository branch: dev Windowing system distributor 'The X.Org Foundation', version 11.0.11906000 System Description: Ubuntu 18.04.4 LTS Configured using: 'configure --prefix=/home/dick/.local --enable-checking --with-tree-sitter --enable-dumping-overwrite 'CFLAGS=-g3 -Og -I/home/dick/.local/include/' LDFLAGS=-L/home/dick/.local/lib' Configured features: CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON TREE-SITTER LCMS2 LIBSELINUX LIBXML2 MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND THREADS TIFF TOOLKIT_SCROLL_BARS WEBP X11 XDBE XIM XPM GTK3 ZLIB Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: Magit Minor modes in effect: async-bytecomp-package-mode: t global-git-commit-mode: t shell-dirtrack-mode: t projectile-mode: t flx-ido-mode: t override-global-mode: t global-hl-line-mode: t winner-mode: t tooltip-mode: t show-paren-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t buffer-read-only: t column-number-mode: t line-number-mode: t transient-mark-mode: t Load-path shadows: /home/dick/gomacro-mode/gomacro-mode hides /home/dick/.emacs.d/elpa/gomacro-mode-20200326.1103/gomacro-mode /home/dick/.emacs.d/elpa/hydra-20170924.2259/lv hides /home/dick/.emacs.d/elpa/lv-20191106.1238/lv /home/dick/.emacs.d/elpa/magit-3.3.0/magit-section-pkg hides /home/dick/.emacs.d/elpa/magit-section-3.3.0/magit-section-pkg /home/dick/org-gcal.el/org-gcal hides /home/dick/.emacs.d/elpa/org-gcal-0.3/org-gcal /home/dick/.emacs.d/elpa/tree-sitter-0.15.2/tree-sitter hides /home/dick/.local/share/emacs/28.0.50/lisp/tree-sitter /home/dick/.emacs.d/lisp/json hides /home/dick/.local/share/emacs/28.0.50/lisp/json /home/dick/.emacs.d/elpa/transient-0.3.6/transient hides /home/dick/.local/share/emacs/28.0.50/lisp/transient /home/dick/.emacs.d/elpa/hierarchy-20171221.1151/hierarchy hides /home/dick/.local/share/emacs/28.0.50/lisp/emacs-lisp/hierarchy Features: (shadow sort footnote mail-extr gnus-msg gnus-art mm-uu mml2015 mm-view mml-smime smime dig gnus-sum shr pixel-fill kinsoku svg dom gnus-group mm-url gnus-undo gnus-start gnus-dbus dbus xml gnus-cloud nnimap nnmail mail-source utf7 netrc nnoo parse-time iso8601 gnus-spec gnus-int gnus-range gnus-win emacsbug sendmail benchmark vc cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs vc-git vc-dispatcher bug-reference face-remap magit-patch-changelog magit-patch magit-submodule magit-obsolete magit-popup async-bytecomp async magit-blame magit-stash magit-reflog magit-bisect magit-push magit-pull magit-fetch magit-clone magit-remote magit-commit magit-sequence magit-notes magit-worktree magit-tag magit-merge magit-branch magit-reset magit-files magit-refs magit-status magit magit-repos magit-apply magit-wip magit-log which-func imenu magit-diff smerge-mode diff diff-mode git-commit log-edit message yank-media rmc puny dired-x dired dired-loaddefs rfc822 mml mml-sec epa epg rfc6068 epg-config mm-decode mm-bodies mm-encode mailabbrev gmm-utils mailheader pcvs-util add-log magit-core magit-margin magit-transient magit-process with-editor shell pcomplete server magit-mode transient format-spec paredit-ext paredit subed subed-vtt subed-srt subed-common subed-mpv subed-debug subed-config inf-ruby ruby-mode smie company pcase haskell-interactive-mode haskell-presentation-mode haskell-process haskell-session haskell-compile haskell-mode haskell-cabal haskell-utils haskell-font-lock haskell-indentation haskell-string haskell-sort-imports haskell-lexeme haskell-align-imports haskell-complete-module haskell-ghc-support noutline outline flymake-proc flymake warnings etags fileloop generator xref project dabbrev haskell-customize hydra lv use-package-ensure solarized-theme solarized-definitions projectile lisp-mnt mail-parse rfc2231 ibuf-ext ibuffer ibuffer-loaddefs thingatpt magit-autorevert autorevert filenotify magit-git magit-section magit-utils crm dash rx grep compile comint ansi-color gnus nnheader gnus-util rmail rmail-loaddefs rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils text-property-search time-date flx-ido flx google-translate-default-ui google-translate-core-ui facemenu color ido google-translate-core google-translate-tk google-translate-backend use-package-bind-key bind-key auto-complete easy-mmode advice edmacro kmacro popup cus-edit pp cus-load wid-edit emms-player-mplayer emms-player-simple emms emms-compat cl-extra help-mode use-package-core derived hl-line winner ring finder-inf json-reformat-autoloads json-snatcher-autoloads sml-mode-autoloads tornado-template-mode-autoloads info package browse-url url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util mailcap url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache json map url-vars seq gv subr-x byte-opt bytecomp byte-compile cconv cl-loaddefs cl-lib iso-transl tooltip eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tree-sitter tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray cl-preloaded nadvice button loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads dbusbind inotify lcms2 dynamic-setting system-font-setting font-render-setting cairo move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 475721 14692) (symbols 48 33157 1) (strings 32 119335 3487) (string-bytes 1 4084749) (vectors 16 48784) (vector-slots 8 611093 13083) (floats 8 409 442) (intervals 56 544 2) (buffers 992 14)) --=-=-=--