From patchwork Sun Jan 9 12:29:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Noah Goldstein X-Patchwork-Id: 49765 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 8B4A1388A022 for ; Sun, 9 Jan 2022 12:30:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8B4A1388A022 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1641731438; bh=Oby0jMURajG5Novx1IjGH4unJQEfF4ApAPTrK+5aQsA=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=hh2sAAbyglwm5OlTysAxZDCOcs+LFo5LzVh5va44hKcf5xADnZC12p2J95QX0wVLR yyZN6kjGiPd4VeLtBldXjCrMOTsWLR7d2v6Jp9mLrd5rYq8X1WECUD+L5aVUpF/FaN c3O9esxpR6RIz3xGILSUvIlmoSR1xMDO6xKpWcjM= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by sourceware.org (Postfix) with ESMTPS id B7ADB388A00C for ; Sun, 9 Jan 2022 12:30:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org B7ADB388A00C Received: by mail-pl1-x636.google.com with SMTP id l8so7616497plt.6 for ; Sun, 09 Jan 2022 04:30:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Oby0jMURajG5Novx1IjGH4unJQEfF4ApAPTrK+5aQsA=; b=UqjxnJpksjLdvD9YK8XL/gXfvG0NIpGRWGkd9i9KQX9bLl/uxal/XE70xYQ//LNKEb kgMq4kz6BsNdf0KH1B6pYxQyLnQL+oNwvO43ykS3NJF3lkvgcCytNl1BGI/fOjVgxiBZ BsECTSCa9DNtuEmh7Cwr5B2MUzkXvhhiU8+0IDwGkGKVJ6O9PXhP8uLeTlnLGBNWJ2Se Db78xuYFHr+dAJZ0Jb7527rZmShOZm7Laq+Z1S9PvAcUTyqMa/Jc7oWNrQaYjcmleLdv cO20QBWAZHsTK+ZFxhDRxIDT7poaFUkmRuAmomqLJYuIjQUBzIPb7C9gaZqSj9XhQurP 0W0w== X-Gm-Message-State: AOAM531L9qjY7p8RdJxvGmfKdYST/bo3G9Zn2r1Qmn30ngUGx1kNHC4p sdIUhSzg0xQcrkXljqvfcFUjjPlLGag= X-Google-Smtp-Source: ABdhPJwGSFGg2l+JB2Qj2OcRZmSiw0arIxCBgSJrgfVonz8xXPjCebZ9mfyK7cGwbAkog5N2prjO2Q== X-Received: by 2002:a17:902:d489:b0:149:8018:e9dc with SMTP id c9-20020a170902d48900b001498018e9dcmr59529362plg.121.1641731414771; Sun, 09 Jan 2022 04:30:14 -0800 (PST) Received: from localhost.localdomain (c-73-202-60-99.hsd1.ca.comcast.net. [73.202.60.99]) by smtp.googlemail.com with ESMTPSA id o27sm2979055pgm.1.2022.01.09.04.30.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Jan 2022 04:30:14 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v1 3/5] string: remove stupid_[strcmp, strncmp, wcscmp, wcsncmp]. Date: Sun, 9 Jan 2022 06:29:45 -0600 Message-Id: <20220109122946.2754917-3-goldstein.w.n@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220109122946.2754917-1-goldstein.w.n@gmail.com> References: <20220109122946.2754917-1-goldstein.w.n@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Noah Goldstein via Libc-alpha From: Noah Goldstein Reply-To: Noah Goldstein Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" These implementations are incorrect. There may be a mismatch in s1/s2 before invalid memory but no null CHAR / length boundary. Signed-off-by: Noah Goldstein --- string/test-strcmp.c | 35 ----------------------------------- string/test-strncmp.c | 34 ---------------------------------- 2 files changed, 69 deletions(-) diff --git a/string/test-strcmp.c b/string/test-strcmp.c index 3c75076fb8..97d7bf5043 100644 --- a/string/test-strcmp.c +++ b/string/test-strcmp.c @@ -34,7 +34,6 @@ # define STRLEN wcslen # define MEMCPY wmemcpy # define SIMPLE_STRCMP simple_wcscmp -# define STUPID_STRCMP stupid_wcscmp # define CHAR wchar_t # define UCHAR wchar_t # define CHARBYTES 4 @@ -64,25 +63,6 @@ simple_wcscmp (const wchar_t *s1, const wchar_t *s2) return c1 < c2 ? -1 : 1; } -int -stupid_wcscmp (const wchar_t *s1, const wchar_t *s2) -{ - size_t ns1 = wcslen (s1) + 1; - size_t ns2 = wcslen (s2) + 1; - size_t n = ns1 < ns2 ? ns1 : ns2; - int ret = 0; - - wchar_t c1, c2; - - while (n--) { - c1 = *s1++; - c2 = *s2++; - if ((ret = c1 < c2 ? -1 : c1 == c2 ? 0 : 1) != 0) - break; - } - return ret; -} - #else # include @@ -92,7 +72,6 @@ stupid_wcscmp (const wchar_t *s1, const wchar_t *s2) # define STRLEN strlen # define MEMCPY memcpy # define SIMPLE_STRCMP simple_strcmp -# define STUPID_STRCMP stupid_strcmp # define CHAR char # define UCHAR unsigned char # define CHARBYTES 1 @@ -113,24 +92,10 @@ simple_strcmp (const char *s1, const char *s2) return ret; } -int -stupid_strcmp (const char *s1, const char *s2) -{ - size_t ns1 = strlen (s1) + 1; - size_t ns2 = strlen (s2) + 1; - size_t n = ns1 < ns2 ? ns1 : ns2; - int ret = 0; - - while (n--) - if ((ret = *(unsigned char *) s1++ - *(unsigned char *) s2++) != 0) - break; - return ret; -} #endif typedef int (*proto_t) (const CHAR *, const CHAR *); -IMPL (STUPID_STRCMP, 1) IMPL (SIMPLE_STRCMP, 1) IMPL (STRCMP, 1) diff --git a/string/test-strncmp.c b/string/test-strncmp.c index e7d5edea39..61a283a0af 100644 --- a/string/test-strncmp.c +++ b/string/test-strncmp.c @@ -33,7 +33,6 @@ # define STRDUP wcsdup # define MEMCPY wmemcpy # define SIMPLE_STRNCMP simple_wcsncmp -# define STUPID_STRNCMP stupid_wcsncmp # define CHAR wchar_t # define UCHAR wchar_t # define CHARBYTES 4 @@ -57,25 +56,6 @@ simple_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) return 0; } -int -stupid_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) -{ - wchar_t c1, c2; - size_t ns1 = wcsnlen (s1, n) + 1, ns2 = wcsnlen (s2, n) + 1; - - n = ns1 < n ? ns1 : n; - n = ns2 < n ? ns2 : n; - - while (n--) - { - c1 = *s1++; - c2 = *s2++; - if (c1 != c2) - return c1 > c2 ? 1 : -1; - } - return 0; -} - #else # define L(str) str # define STRNCMP strncmp @@ -83,7 +63,6 @@ stupid_wcsncmp (const CHAR *s1, const CHAR *s2, size_t n) # define STRDUP strdup # define MEMCPY memcpy # define SIMPLE_STRNCMP simple_strncmp -# define STUPID_STRNCMP stupid_strncmp # define CHAR char # define UCHAR unsigned char # define CHARBYTES 1 @@ -101,23 +80,10 @@ simple_strncmp (const char *s1, const char *s2, size_t n) return ret; } -int -stupid_strncmp (const char *s1, const char *s2, size_t n) -{ - size_t ns1 = strnlen (s1, n) + 1, ns2 = strnlen (s2, n) + 1; - int ret = 0; - - n = ns1 < n ? ns1 : n; - n = ns2 < n ? ns2 : n; - while (n-- && (ret = *(unsigned char *) s1++ - * (unsigned char *) s2++) == 0); - return ret; -} - #endif typedef int (*proto_t) (const CHAR *, const CHAR *, size_t); -IMPL (STUPID_STRNCMP, 0) IMPL (SIMPLE_STRNCMP, 0) IMPL (STRNCMP, 1)