From nobody Tue Feb 04 14:16:37 2025 X-Original-To: dev-commits-src-main@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 4YnQQt0NfJz5mt84; Tue, 04 Feb 2025 14:16:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnQQs4bWcz43NR; Tue, 04 Feb 2025 14:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738678597; 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=qSp8leeOmyP62bMXjogfyAwMUwwVM/aoaAoAiWrYbgA=; b=eIZSP6VSf+UDkpv8ix7LE9XyiXzNzBtkRByyBbv5rb2ATA6UDjUznLcrc70OJAsINERlPG yFRIXv+P3edhAYLMIG4sou70c/Klp4WQPdSxG6vZXmTR5TmoAH18FA6ZqsEEQfV9ZJ6Lac vu7KnifCkAbpLiGbk7HMEofLrzXtw7YEUSueZ7n2tkxBNtvKer6RRi4TWL774koK2W2l+A Y+P+NoMWd6vtz8giqezCgBf5CoFobkqw5/sQkVUtXWzIXRoCUpFERv4gt8TfrVpyEh8zT7 oj1Ul4IziW2EKvrTWZAFXZl60Bt9OdC5ywDEe3wGMmPBJhqYJGTOafbTh5541g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738678597; 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=qSp8leeOmyP62bMXjogfyAwMUwwVM/aoaAoAiWrYbgA=; b=t10KucZkPiOSsKdkyF2Rk+jwxdp9GsusSzOSk1MCm0ZYcIGeexXiE7lYFLJnHKdWEaHyXq xRhWtCT3KlX/dU2gGZQEqTwWo4u5+8HlYGfYlZGdOaflp4vPI06wo9NYapGA2h3ncMBM71 uTecgjxmNLMQsM2nQpxTwkfblLTBZfM97vtWO5XZW5zGxaU6CrfiUJhqpRvE6VqoTXSr1E 4hr/X/oolyAZRcIX+YrtDf6GTp7gfGZcfn/4XNRsHCBATasWWSHtu3M48ra6G/5W7VeBwI YGMQL4Zf491VI5EZPtEQSXy0xM6QrtJz+cX6YWQYSU2DF+G+qih+DTLBacK2YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738678597; a=rsa-sha256; cv=none; b=XW9RYBJ+CWn/sioIQ+hXA3Uk8XqntAgz2QKjFm71khoLBLPz0klT5bDhASGf4p3NDxMxHp Nc5h6Q+Hcl+1LbG5M+iV9Dc6z8oQGJjY13EkP9ehy9hhO4/fIEah71DZJkCfXXGzPku7aK 58rKQv+UyFb5XLp+o4sdva4HmSmlTt7svtLRw6HzP1TpqIdUOuCDe1zeGhkpevqTHPx0I8 4nosny+wVfy6tlPNQBcZhmmI/V5qlZsI6JcEMAqn03T8UXqV3Fx2VjfFUnOR/tIyuy5Pa7 PNdWlAmHLykGSsVtGalkwYSbYQNPc9gdSZwJStUoZXh7MP1yqYJxW5VyTlubyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YnQQs489cz1Mqh; Tue, 04 Feb 2025 14:16:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 514EGbIl048156; Tue, 4 Feb 2025 14:16:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 514EGb9G048153; Tue, 4 Feb 2025 14:16:37 GMT (envelope-from git) Date: Tue, 4 Feb 2025 14:16:37 GMT Message-Id: <202502041416.514EGb9G048153@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jose Luis Duran Subject: git: bccaf0262dca - main - libopencsd: Remove extra slashes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jlduran X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bccaf0262dcab84be49c42cc6b7a81c279c44b62 Auto-Submitted: auto-generated The branch main has been updated by jlduran: URL: https://cgit.FreeBSD.org/src/commit/?id=bccaf0262dcab84be49c42cc6b7a81c279c44b62 commit bccaf0262dcab84be49c42cc6b7a81c279c44b62 Author: Jose Luis Duran AuthorDate: 2025-02-04 14:15:37 +0000 Commit: Jose Luis Duran CommitDate: 2025-02-04 14:15:37 +0000 libopencsd: Remove extra slashes Remove extra slashes that end up in the metalog. These double slashes can produce an invalid specification file if there are subdirectories down the hierarchy when sorted. For example, consider the following metalog excerpt: ./base/aaa type=dir ./base//aaa/bbb type=dir If sorted, would turn out: ./base//aaa/bbb type=dir ./base/aaa type=dir Apparently missing the ./base/aaa directory in the specification. Luckily here are no subdirectories. Reviewed by: imp, emaste Approved by: emaste (mentor) MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D48779 --- lib/libopencsd/Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile index aae0b795c216..649e756eacf6 100644 --- a/lib/libopencsd/Makefile +++ b/lib/libopencsd/Makefile @@ -121,7 +121,7 @@ APIINCS= \ ocsd_c_api_types.h \ opencsd_c_api.h -APIINCSDIR=${INCLUDEDIR}/opencsd/c_api/ +APIINCSDIR=${INCLUDEDIR}/opencsd/c_api ETEINCS= \ ete_decoder.h \ @@ -129,7 +129,7 @@ ETEINCS= \ trc_dcd_mngr_ete.h \ trc_pkt_types_ete.h -ETEINCSDIR=${INCLUDEDIR}/opencsd/ete/ +ETEINCSDIR=${INCLUDEDIR}/opencsd/ete ETMV4INCS= \ etmv4_decoder.h \ @@ -142,7 +142,7 @@ ETMV4INCS= \ trc_pkt_proc_etmv4i.h \ trc_pkt_types_etmv4.h -ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4/ +ETMV4INCSDIR=${INCLUDEDIR}/opencsd/etmv4 ETMV3INCS= \ etmv3_decoder.h \ @@ -153,7 +153,7 @@ ETMV3INCS= \ trc_pkt_proc_etmv3.h \ trc_pkt_types_etmv3.h -ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3/ +ETMV3INCSDIR=${INCLUDEDIR}/opencsd/etmv3 PTMINCS= \ ptm_decoder.h \ @@ -164,7 +164,7 @@ PTMINCS= \ trc_pkt_proc_ptm.h \ trc_pkt_types_ptm.h -PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm/ +PTMINCSDIR=${INCLUDEDIR}/opencsd/ptm STMINCS= \ stm_decoder.h \ @@ -175,7 +175,7 @@ STMINCS= \ trc_pkt_proc_stm.h \ trc_pkt_types_stm.h -STMINCSDIR=${INCLUDEDIR}/opencsd/stm/ +STMINCSDIR=${INCLUDEDIR}/opencsd/stm INCSGROUPS=INCS APIINCS ETEINCS ETMV3INCS ETMV4INCS PTMINCS STMINCS