From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ramsay Jones Subject: [PATCH] convert.c: fix some sparse warnings Date: Sun, 24 Apr 2016 18:14:10 +0100 Message-ID: <571CFEE2.2070708@ramsayjones.plus.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: Junio C Hamano , GIT Mailing-list To: =?UTF-8?Q?Torsten_B=c3=b6gershausen?= X-From: git-owner@vger.kernel.org Sun Apr 24 19:14:22 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1auNbx-0004jN-Fk for gcvg-git-2@plane.gmane.org; Sun, 24 Apr 2016 19:14:21 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752699AbcDXROR (ORCPT ); Sun, 24 Apr 2016 13:14:17 -0400 Received: from avasout07.plus.net ([84.93.230.235]:48478 "EHLO avasout07.plus.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752583AbcDXROQ (ORCPT ); Sun, 24 Apr 2016 13:14:16 -0400 Received: from [10.0.2.15] ([91.125.197.102]) by avasout07 with smtp id mHED1s0032D2Veb01HEERe; Sun, 24 Apr 2016 18:14:15 +0100 X-CM-Score: 0.00 X-CNFS-Analysis: v=2.1 cv=QqujpgGd c=1 sm=1 tr=0 a=mTUfFwB0nGOO66Ym8a+i3w==:117 a=mTUfFwB0nGOO66Ym8a+i3w==:17 a=L9H7d07YOLsA:10 a=9cW_t1CCXrUA:10 a=s5jvgZ67dGcA:10 a=IkcTkHD0fZMA:10 a=EBOSESyhAAAA:8 a=ehP1j3z9y6A82uJi7o4A:9 a=QEXdDO2ut3YA:10 X-AUTH: ramsayjones@:2500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Sparse complains thus: SP convert.c convert.c:178:24: warning: Using plain integer as NULL pointer convert.c:239:28: warning: dubious: !x & y Signed-off-by: Ramsay Jones --- Hi Torsten, When you next re-roll your 'tb/convert-eol-autocrlf' branch, could you please squash this into your patch corresponding to commit cbcc0471 ("convert.c: more safer crlf handling with text attribute", 22-04-2016). [No, you have seen this before! ;-) ] Thanks! ATB, Ramsay Jones convert.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/convert.c b/convert.c index 8d4c42a..3d36c45 100644 --- a/convert.c +++ b/convert.c @@ -175,7 +175,7 @@ const char *get_wt_convert_stats_ascii(const char *path) memset(&stats, 0, sizeof(stats)); fd = open(path, O_RDONLY); if (fd < 0) - return 0; + return NULL; for (;;) { char buf[1024]; ssize_t readlen = read(fd, buf, sizeof(buf)); @@ -236,7 +236,7 @@ static int would_convert_lf_at_checkout(unsigned convert_stats, return 0; /* No "naked" LF? Nothing to convert, regardless. */ - if (!convert_stats & CONVERT_STAT_BITS_TXT_LF) + if (!(convert_stats & CONVERT_STAT_BITS_TXT_LF)) return 0; if (crlf_action == CRLF_AUTO || -- 2.8.0