From nobody Wed Oct 19 08:01:29 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MsjqF6Rt7z4gDcY; Wed, 19 Oct 2022 08:01:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MsjqF3DHVz3xjr; Wed, 19 Oct 2022 08:01:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXIVTsi65GBh1KIVSCiOxaSJSL8ei1gzAviW1vmVjUc=; b=PcXz2eYL5l+YwbcB9JY9oI4E3ycfiUWQSuwBV9ETD4dVFlv2dexZrSlXD4bOAqmykwbUNZ wU1Yyc0G4rG5O0QEOQwFRBWSZ7qfEBhRMPhqh2reeg8xmVzuFjwuzyy1H/9BDhNcByDj0A 5NV9ko4fczGsQw1s3EQmPHONAUGTK767lKgIevGA2TAxzSNyELQXoYc9dSkcac5eYssTDl mmL4HKATLhTBrc+NMXFlFKpTMUtGvbxr/ZAHt/9LFsNYDYS5jtU4s66W+oCQ+LQ4OtH8Je 9rppRO436SShZ3kpxZu6eITuSWmOVXMfp6kHH4HovmahTY1BHlLQskuAtI/b9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MsjqF15MszSN0; Wed, 19 Oct 2022 08:01:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29J81T5e060693; Wed, 19 Oct 2022 08:01:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29J81Tve060692; Wed, 19 Oct 2022 08:01:29 GMT (envelope-from git) Date: Wed, 19 Oct 2022 08:01:29 GMT Message-Id: <202210190801.29J81Tve060692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 713ef741b77d - stable/13 - sort: cleanup now unused structutre and prototypes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 713ef741b77d4a61019fbb900db2b190fed77ccb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666166489; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GXIVTsi65GBh1KIVSCiOxaSJSL8ei1gzAviW1vmVjUc=; b=GiqD3l9OJqh5Nfc29SrDLwJMTjuimaHOMAaj7fK1cGoTy4M7OLEEDPK1os9yOJDiCzxcYN tW5CC9NPOOjUgyC/GEYOWG7U5xfp6SIGeqLdJPltD+hiDZ1i5p5eSkMBuMT88pWks2FXoj RBSGm+1vVQzf4uF902NRR/JnGFdloFZEAhQ9PVzFcTfiXf89mYwVW+LaPZ9NkTyapCGUqH whbi7xy9PxipkEp5X//smuZGdN6IyAjZPsM4yiV70NjXA3fAVjKrZxPTOykTpOvHGBMRKh NDwcO7OFTqUgUeXKF2oEGh5owZm7a4S7LVRa1rwK/GSt8zwv6/M4AiOo+qSN6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666166489; a=rsa-sha256; cv=none; b=m6dQIrbwoXV5mB3li4QgKy9dFRoU/kDZsgyqKLV/3FDantUpD3A2fsbKFbjP3iWnTnGdQc t2PDCtqfdyvB5vUlZFEKIJruPwN/1y18QoJJEvoNm4oVfp8DeX5dB3tTNkAh3gwfq68SVX M0YLbJ9Ngk23J6EbZyjq6dhrU0OduWERixz8gEneAP4NS0Ffpoeq+e0B3QERU3HwcsASHF hytAFu9rn2TVyT01HHpZzcJAonOiaskG0hlG6f8elebL5vqxT43CJZDqiq+XM8j64ZP4Tw /mjIy0eoe3kjv5trH8Z3zz71mAWsxWxscUEcpykEz2IePK/sHLrCOahP85tEQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=713ef741b77d4a61019fbb900db2b190fed77ccb commit 713ef741b77d4a61019fbb900db2b190fed77ccb Author: Baptiste Daroussin AuthorDate: 2022-10-13 08:19:18 +0000 Commit: Baptiste Daroussin CommitDate: 2022-10-19 07:59:28 +0000 sort: cleanup now unused structutre and prototypes (cherry picked from commit 4d4fcf619efcc02a962d0723a7ccd94fb621c6e6) --- usr.bin/sort/bwstring.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/usr.bin/sort/bwstring.h b/usr.bin/sort/bwstring.h index 09a0dbf2fac2..129d03ad14b7 100644 --- a/usr.bin/sort/bwstring.h +++ b/usr.bin/sort/bwstring.h @@ -67,12 +67,6 @@ struct bwstring }; }; -struct reader_buffer -{ - wchar_t *fgetwln_z_buffer; - size_t fgetwln_z_buffer_size; -}; - typedef void *bwstring_iterator; #define BWSLEN(s) ((mb_cur_max == 1) ? (s)->cdata.len : (s)->wdata.len) @@ -104,7 +98,6 @@ int bwscmp(const struct bwstring *bws1, const struct bwstring *bws2, size_t offs int bwsncmp(const struct bwstring *bws1, const struct bwstring *bws2, size_t offset, size_t len); int bwscoll(const struct bwstring *bws1, const struct bwstring *bws2, size_t offset); size_t bwsfwrite(struct bwstring *bws, FILE *f, bool zero_ended); -struct bwstring *bwsfgetln(FILE *file, size_t *len, bool zero_ended, struct reader_buffer *rb); static inline bwstring_iterator bws_begin(struct bwstring *bws)