From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 118003 invoked by alias); 25 Jun 2017 10:58:55 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 117973 invoked by uid 89); 25 Jun 2017 10:58:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_HELO_PASS,SPF_SOFTFAIL autolearn=ham version=3.3.2 spammy= X-HELO: simark.ca Received: from simark.ca (HELO simark.ca) (158.69.221.121) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 25 Jun 2017 10:58:51 +0000 Received: by simark.ca (Postfix, from userid 33) id BB6DD1E5A1; Sun, 25 Jun 2017 06:58:49 -0400 (EDT) To: Sergio Durigan Junior Subject: Re: [PATCH 4/4] main: Don't add int to string X-PHP-Originating-Script: 33:rcube.php MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sun, 25 Jun 2017 10:58:00 -0000 From: Simon Marchi Cc: Simon Marchi , gdb-patches@sourceware.org In-Reply-To: <878tklcc4e.fsf@sergiodj.net> References: <1498076108-29914-1-git-send-email-simon.marchi@ericsson.com> <1498076108-29914-5-git-send-email-simon.marchi@ericsson.com> <878tklcc4e.fsf@sergiodj.net> Message-ID: <597661778d602667b0f9eecb4db089b7@polymtl.ca> X-Sender: simon.marchi@polymtl.ca User-Agent: Roundcube Webmail/1.2.5 X-IsSubscribed: yes X-SW-Source: 2017-06/txt/msg00685.txt.bz2 On 2017-06-21 22:35, Sergio Durigan Junior wrote: > On Wednesday, June 21 2017, Simon Marchi wrote: > >> clang shows this warning: >> >> /home/emaisin/src/binutils-gdb/gdb/main.c:227:56: error: adding >> 'int' to a string does not append to the string >> [-Werror,-Wstring-plus-int] >> char *tmp_sys_gdbinit = xstrdup (SYSTEM_GDBINIT + >> datadir_len); >> >> ~~~~~~~~~~~~~~~^~~~~~~~~~~~~ >> /home/emaisin/src/binutils-gdb/gdb/main.c:227:56: note: use array >> indexing to silence this warning >> char *tmp_sys_gdbinit = xstrdup (SYSTEM_GDBINIT + >> datadir_len); >> ^ >> & [ >> ] >> >> It's quite easy to get rid of it by using &foo[len] instead of foo + >> len. >> I think this warning is relevant to keep enabled, because it can be an >> easy mistake to do. >> >> This warning is already discussed here in GCC bugzilla: >> >> https://gcc.gnu.org/ml/gcc-patches/2017-06/msg00729.html >> >> and a patch series for it was submitted very recently. >> >> gdb/ChangeLog: >> >> * main.c (get_init_files): Replace "SYSTEM_GDBINIT + >> datadir_len" with "&SYSTEM_GDBINIT[datadir_len]". >> --- >> gdb/main.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/gdb/main.c b/gdb/main.c >> index df4b111..9813041 100644 >> --- a/gdb/main.c >> +++ b/gdb/main.c >> @@ -224,7 +224,7 @@ get_init_files (const char **system_gdbinit, >> { >> /* Append the part of SYSTEM_GDBINIT that follows GDB_DATADIR >> to gdb_datadir. */ >> - char *tmp_sys_gdbinit = xstrdup (SYSTEM_GDBINIT + >> datadir_len); >> + char *tmp_sys_gdbinit = xstrdup >> (&SYSTEM_GDBINIT[datadir_len]); >> char *p; >> >> for (p = tmp_sys_gdbinit; IS_DIR_SEPARATOR (*p); ++p) >> -- >> 2.7.4 > > LGTM. > > Thanks, Thanks, pushed.