From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12074 invoked by alias); 6 Jan 2015 07:19:33 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 34121 Received: (qmail 28807 invoked from network); 6 Jan 2015 07:19:30 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=d2jwOyCD46RC49mnkSK5HvQX1KUztpJVmaaaSxJx8jk=; b=nJppVI7JLHMkeySonI8lGucr2RsWd2OUqOyaSLREWl7udxhQ+7jW9NmG9fPE5n+mxe ze6GtwmZXS8b+BS5tnin1UrUVxzeT2J6QyLvg73nxmWCKcSdv/NQgeYiBH2CGzHkVfYE w2bhEfwSmTKFrSBGComr8F28EU5UpWgNlNcOCp/V89h8WpFxqi1FeCZ4+NPf9PEeyJue XMcA0bgNpzfZZ9BhDTrKD2RvkaF1amxd1DmUF7Sv99doV9KUdWHCVFdab7l93Z7iOdGi PVyk2pYtMp9+zmImlXgrSsmnRB7lHFR+xE/b+BET031yAcUY7RYixIxkT090Ho1QS+XA R0HA== X-Received: by 10.180.21.225 with SMTP id y1mr32452565wie.42.1420521973655; Mon, 05 Jan 2015 21:26:13 -0800 (PST) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH 07/17: compresult: Remove unneeded NULL check Date: Tue, 6 Jan 2015 06:25:39 +0100 Message-Id: <1420521949-30483-8-git-send-email-mikachu@gmail.com> X-Mailer: git-send-email 2.2.0.GIT In-Reply-To: <1420521949-30483-1-git-send-email-mikachu@gmail.com> References: <1420521949-30483-1-git-send-email-mikachu@gmail.com> The variable is set to if NULL at the start of the function, and derefed on the previous line. Found by Coverity (Issue 1255843). --- Src/Zle/compresult.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Src/Zle/compresult.c b/Src/Zle/compresult.c index 93438a0..dbef7f8 100644 --- a/Src/Zle/compresult.c +++ b/Src/Zle/compresult.c @@ -1098,7 +1098,7 @@ do_single(Cmatch m) } else { p = (char *) zhalloc(strlen(prpre) + strlen(str) + strlen(psuf) + 3); - sprintf(p, "%s%s%s", ((prpre && *prpre) ? + sprintf(p, "%s%s%s", (*prpre ? prpre : "./"), str, psuf); } /* And do the stat. */ -- 2.2.0.GIT