From patchwork Mon Dec 16 21:50:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 103213 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 477303858416 for ; Mon, 16 Dec 2024 21:51:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 477303858416 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=M5QAY3mk X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-io1-xd29.google.com (mail-io1-xd29.google.com [IPv6:2607:f8b0:4864:20::d29]) by sourceware.org (Postfix) with ESMTPS id A3D573858416 for ; Mon, 16 Dec 2024 21:50:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A3D573858416 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A3D573858416 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::d29 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734385828; cv=none; b=UdxNC6o6T2sHwyt117KsftKhqWDrTIGkGBWGEQSNZPS6sOzJRovy0TEvdqYfC/1swFV3YOkxNcTMEv8txLzKzWwOrHTYV3nP+Hr09cWFf+8vXyjR56wPh2KRRFU1BU5uIOD7hZRzZXEN0xV3tGbFlG8529sJx7QQ+AN0zYkenEg= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1734385828; c=relaxed/simple; bh=+jt5x+DdlV2bZk8LLIHb/7g/E3V9UKVuCz9qTeAHDQg=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=SgiwhFg2IljcKpVApbMqTWYAfo7XVor6PlPjz5HTtSasISWkoRdUr35YeIVwBsgToIZpFME07tgnqncBfdjX+byGsJBFh1i9cxZ8EDrzPyq+jlZPK5UQuPb4olgOmffhYL1NetNpQPeSrxm9jrYBRBZX+m6wpP9qch8bCd8/NlE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A3D573858416 Received: by mail-io1-xd29.google.com with SMTP id ca18e2360f4ac-844de072603so406278139f.0 for ; Mon, 16 Dec 2024 13:50:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734385828; x=1734990628; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=PDIEfAolYtpv9h1TlIrQn1bYvcwLNIWbxVxSJ+Y+I40=; b=M5QAY3mknxI2rLQqdqbBFhyr6IEnvUsZqeEU1FBQtiLeKEDBhA3lURoA8VHDxVxfEy AEDcTZGIuAZOT+DXvKODlSr99YWE5fSfhzjnywlHTkICPMRlrgtF2RxsFAfN7KqOCL/F WAwNuLXUSNapvt35SX5IqLsaZcPP7bDweBFOl0/GitOBTtsjwNITiYPhVxZqV4fCNT0L pzwcN0qJ6LWsXsLiV6O4qRR/vUtawUASduHveiR1FqubGAM0p6+xwN6WxEMEKu6WDAhY iprsljEOYL15Sj8Wn3ijwsfo/2aKbZn06wmccjFTK+Faef9VZh+7OWcM3lNJ+cBcinaY 8edw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734385828; x=1734990628; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=PDIEfAolYtpv9h1TlIrQn1bYvcwLNIWbxVxSJ+Y+I40=; b=Uye+52kjrVBi5AjKxl3e5eGLesFR3JTsjD5LG9deYeUZ+q23XIc5TIQnQtAA5XXBxy 8jPIq4lwk2s1n9HIABjerxKosEDRAIOKNEA88VGjCUZLHf9KGrJINBCk4wDo3+DxXFnK 2JahMsr/WPPXN3apneiLlCrNMGaa7dl39Ui6cp2RtYuRzqhm6eJpC5/KQmbMCKvDooO0 PVKjkbzgA2hR1inhNcHzcyiwlOA9Bvb9x+AytVtGA28utonwQt/NLqVPxXZEybXi2ALu pIeDNLP021mNf9w+/P/xBY6uQrw6iEdGupl9PqC1VBwqjO7eY3q/N2+P5bFn5ALRS4jn Dd7g== X-Gm-Message-State: AOJu0Ywp7NK1Ejyj2/dB9bsGoVDPaDOKsuUsPP/hH/WyhaHL3yeGUPkm aAZ7miiU/IuTfX9Yer1+Q9iZtpjAEYH8oDTtZkXq6X/0n/eT0qrlm0+B49HktgYPew+S X-Gm-Gg: ASbGncsCCQRSWtmytu8krwbMsJkDKXShwkHx1SMtgw8tMv9U+X275+nL1JUim9K4bLQ KqL+MHbdCUwQ3DtGfdWwdEU5itBl+2R/H2/hmn5DGuIcanxxG8rEPXknZoInvjzqvMkl2hLWSiT Vt/FRbMMYiqov//WLkUdz4/v1DSh5bnaAh5JyMTxhxSGkR/2QutL/SSwZMcmew4JeyCINqv6rez sLIHCB/+oonMEULmaDkS4da9pW2ushN5I3nNFX1qP78FAb6hDV6jzQi8CN3u/T7yrJdRRRqAaps Q23kkYfovw7bA132KX0eQTpPtZ6SI6itZW7qU7s0P4+7 X-Google-Smtp-Source: AGHT+IFgycIoz74C6MZCajmRVWYhiZdCmSPWX2AiV1fgGht5He1MFyXIjmdBEo/Io7xfcelsFHTPWQ== X-Received: by 2002:a05:6602:3f86:b0:83a:db84:41a8 with SMTP id ca18e2360f4ac-844e8899696mr1491110739f.10.1734385827803; Mon, 16 Dec 2024 13:50:27 -0800 (PST) Received: from gnu-tgl-3.localdomain ([172.58.160.37]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4e5e03687c1sm1394480173.23.2024.12.16.13.50.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Dec 2024 13:50:27 -0800 (PST) Received: from gnu-tgl-3.. (localhost [IPv6:::1]) by gnu-tgl-3.localdomain (Postfix) with ESMTP id D332AC0188; Tue, 17 Dec 2024 05:50:23 +0800 (CST) From: "H.J. Lu" To: libc-alpha@sourceware.org Cc: sam@gentoo.org Subject: [PATCH] Avoid add an integer to a string Date: Tue, 17 Dec 2024 05:50:23 +0800 Message-ID: <20241216215023.3403231-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.47.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3019.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org Clang 19 issues an error: tst-iconv-sticky-input-error.c:125:42: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int] 125 | expected_output = "ABXY" + skip; | ~~~~~~~^~~~~~ tst-iconv-sticky-input-error.c:125:42: note: use array indexing to silence this warning 125 | expected_output = "ABXY" + skip; | ^ | & [ ] Use array indexing instead. Signed-off-by: H.J. Lu --- dirent/tst-readdir-long.c | 2 +- dirent/tst-rewinddir.c | 2 +- iconv/tst-iconv-sticky-input-error.c | 6 +++--- posix/bug-regex24.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dirent/tst-readdir-long.c b/dirent/tst-readdir-long.c index 409318fa52..18c8521d28 100644 --- a/dirent/tst-readdir-long.c +++ b/dirent/tst-readdir-long.c @@ -59,7 +59,7 @@ add_directory_entry (struct support_fuse_dirstream *d, uint64_t offset) if (offset <= 1) { type = DT_DIR; - name = ".." + !offset; /* "." or "..". */ + name = &".."[!offset]; /* "." or "..". */ ino = 1; } else if (length == 1000) diff --git a/dirent/tst-rewinddir.c b/dirent/tst-rewinddir.c index 1479766ebe..8e24d2737a 100644 --- a/dirent/tst-rewinddir.c +++ b/dirent/tst-rewinddir.c @@ -30,7 +30,7 @@ static char * name_at_offset (unsigned int offset) { if (offset <= 1) - return xstrdup (".." + !offset); /* "." or "..". */ + return xstrdup (&".."[!offset]); /* "." or "..". */ else /* Pad the name with a lot of zeros, so that the dirent buffer gets filled more quickly. */ diff --git a/iconv/tst-iconv-sticky-input-error.c b/iconv/tst-iconv-sticky-input-error.c index 34a245f185..d82d885023 100644 --- a/iconv/tst-iconv-sticky-input-error.c +++ b/iconv/tst-iconv-sticky-input-error.c @@ -122,11 +122,11 @@ do_test (void) { const char *expected_output; if (do_ignore || strstr (charsets[to_idx], "//IGNORE") != NULL) - expected_output = "ABXY" + skip; + expected_output = &"ABXY"[skip]; else - expected_output = "AB" + skip; + expected_output = &"AB"[skip]; one_direction (charsets[from_idx], charsets[to_idx], do_ignore, - "AB\xffXY" + skip, expected_output, limit); + &"AB\xffXY"[skip], expected_output, limit); } return 0; diff --git a/posix/bug-regex24.c b/posix/bug-regex24.c index 97c5c3508a..f5897746e9 100644 --- a/posix/bug-regex24.c +++ b/posix/bug-regex24.c @@ -45,10 +45,10 @@ do_test (void) { int len = m[i].rm_eo - m[i].rm_so; - printf ("m[%d] = \"%.*s\"\n", i, len, str + m[i].rm_so); + printf ("m[%d] = \"%.*s\"\n", i, len, &str[m[i].rm_so]); if (strlen (expected[i]) != len - || memcmp (expected[i], str + m[i].rm_so, len) != 0) + || memcmp (expected[i], &str[m[i].rm_so], len) != 0) result = 1; }