From patchwork Fri Oct 10 15:51:13 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alejandro Colomar X-Patchwork-Id: 121633 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 0590A3857C58 for ; Fri, 10 Oct 2025 15:51:59 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0590A3857C58 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=f45ztMIV X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by sourceware.org (Postfix) with ESMTPS id F30433858CD9 for ; Fri, 10 Oct 2025 15:51:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F30433858CD9 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=kernel.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=kernel.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org F30433858CD9 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=172.105.4.254 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1760111477; cv=none; b=VG4A5SC9+rFxsYZVf0jesEVG4vaaEmEQ/JAmlpDFpuJaFfdoz3+/2EaMC2KNv63OXL5TKfI2Hkm7zWEMBZw+WAQknGeeAclLc69KKcDEbqzj4L4JvFjTR1Ozy2wJuZoXhVmh7T54sEVwzOI9MgGFBm8muXwfLkdwnqKCQvaohvQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1760111477; c=relaxed/simple; bh=hbmzYitKIHUOhJaMQsc7bwSFQODmT9M9QxwZiLIs7qA=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=tUuoAVn3e3pRoaQdlfohzxuxTysijaK8SDXQFRtcoykGb/5yMBfOBpB1QRT2nyNjeL44ao9rC5J1V8KgbTYZb9gjVjLpImL1FgCajQADJHs2AsQ7pSMEF4HjaM0c8jl33k6KTxgu9ZLP7ct6rKgZLDStxH1QjotB0KyOTfj/n00= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F30433858CD9 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 498EA626AC for ; Fri, 10 Oct 2025 15:51:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46C3CC4CEF1; Fri, 10 Oct 2025 15:51:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1760111476; bh=hbmzYitKIHUOhJaMQsc7bwSFQODmT9M9QxwZiLIs7qA=; h=Date:From:To:Cc:Subject:From; b=f45ztMIVh5QdcM6XFnaFJhF5GzoYuKaNQSpqXEkx0w7Bkk/N6cqUANLwHWU+n02OI ys7+Nhmdl7IOMgCdrRyjbfDCcyjllucvnbFeF4N23HivvLKzesjlCwm9TWxgpeA9j4 0+ycXoGiRGVh4wFg0mxbFY0B75IESc1LJEz4JoayEVtFSe81IJltRvhI4ABKs2QFjA MJ3n/maeAiGncuJB6XNDRq+weKa9g0aos53yXD/CcBtKx0ie62FNqQIJ/Ohl/HbiUy TzHKIXyyyO1qax+l7o5+7+qtHBjEZyWmFTjLkon5B7eIA2EZfTJbrLEolMT/0xU8uc oqDYZQwnlmCew== Date: Fri, 10 Oct 2025 17:51:13 +0200 From: Alejandro Colomar To: libc-alpha@sourceware.org Cc: Alejandro Colomar Subject: [PATCH] Remove redundant code Message-ID: <640861d32bac630b7572b0b89bccd84dacfa9731.1760111295.git.alx@kernel.org> X-Mailer: git-send-email 2.51.0 MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-10.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED, 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 free(3) guarantees preservation of errno. Signed-off-by: Alejandro Colomar --- Hi! While having a look at code implementing and using realloc(3), I found some cases of dead code around free(3). Here's some patch to remove it. I've ran 'make check', to make sure there are no regressions. Both before and after this patch, I see === Summary of results === 8 FAIL 7000 PASS 92 UNSUPPORTED 16 XFAIL 4 XPASS Have a lovely day! Alex hesiod/hesiod.c | 2 -- io/ftw.c | 7 ------- 2 files changed, 9 deletions(-) diff --git a/hesiod/hesiod.c b/hesiod/hesiod.c index fe61d0d565..0023d20ed2 100644 --- a/hesiod/hesiod.c +++ b/hesiod/hesiod.c @@ -135,12 +135,10 @@ hesiod_init(void **context) { void hesiod_end(void *context) { struct hesiod_p *ctx = (struct hesiod_p *) context; - int save_errno = errno; free(ctx->RHS); free(ctx->LHS); free(ctx); - __set_errno(save_errno); } /* diff --git a/io/ftw.c b/io/ftw.c index dce2e67f72..d6c53939d0 100644 --- a/io/ftw.c +++ b/io/ftw.c @@ -306,9 +306,7 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp) if (newp == NULL) { /* No more memory. */ - int save_err = errno; free (buf); - __set_errno (save_err); return -1; } buf = newp; @@ -327,9 +325,7 @@ open_dir_stream (int *dfdp, struct ftw_data *data, struct dir_data *dirp) data->dirstreams[data->actdir]->content = content; if (content == NULL) { - int save_err = errno; free (buf); - __set_errno (save_err); result = -1; } else @@ -571,7 +567,6 @@ fail: } else { - int save_err; char *runp = dir.content; while (result == 0 && *runp != '\0') @@ -584,9 +579,7 @@ fail: runp = endp + 1; } - save_err = errno; free (dir.content); - __set_errno (save_err); } if ((data->flags & FTW_ACTIONRETVAL) && result == FTW_SKIP_SIBLINGS)