From nobody Mon Nov 28 17:27:02 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 4NLXTM2TFXz4jQtN; Mon, 28 Nov 2022 17:27:03 +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 4NLXTM0fWqz43lq; Mon, 28 Nov 2022 17:27:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656423; 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=xxIRslVP3L1KzJuujVRHxtvAD0ClQHupRTzu+qxtOvw=; b=cpt+CuHXz4jMXwXrxBABv+uUatSmfivavWIEBzoQGGZ0KxRGp/T53UQJwSry/eKtpinhgG sxOXovcyPshz9yeTEPqo4aAwpun5cwmkojhvGoIHPAnljZ/yVsxt0Vbcqp8xn4M6RhKeTr FOnDWClPY5hiObl2SZ1bZ/NoiN8xDsBT3Zh/w73+PhvlwAuyCBbaGtNwvkqEnkTR025esO 61kHL6Jg4nXApr958JxGXxj9KqRQeBBpy4SwqK38mtlGtMap0/ObUkQ6rcb5FhDM7yKAW+ ETonv0AzZZPGH7IbLDGKNXmQiPsV4qrbE56vokw2fM6Ye3InGaPIPiWKFcBbJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669656423; 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=xxIRslVP3L1KzJuujVRHxtvAD0ClQHupRTzu+qxtOvw=; b=i9i03pitmlmJCBCwr1W2sr7wzB+Awcy5YatllecAdfauCdaJkrrygol2WAcbyQ1RF+ibDZ wlEbO36uqbddXzwfELBzHTqq9/OqYs17hnfXabII6Uw6GPbDQnweM22e+6wvKbZT8jnyJc rX22THvBuEc/3+y9KWbwkO5nEz5GMtvJrh/PKIvVBiA03MWSCzXet+KbfW/+UUJliZcYvA 019WUPVPu4eVEnPKSOMR1JokCCYIUEP8ajRfLiRQm414jnrIDWZdBHQGSAfM+iKjGhqDmz hlWXUlxouQWGGOxCqdkjqGrWM/IsU7ODNCwjR2VgvmFlKd2ELsfmtlA3ttX0hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669656423; a=rsa-sha256; cv=none; b=DCgVxaUA7F6FQGeIH4qunVzF0ZEfpTElzarmVQCSn31jRCwXeZOUIJDdXS/5D4f5UTEtOD 4LMIT9nHFeMhB7f4zQir2GV6FbM9AGPJX4mc7/1NbS7K1uNsSMarMR31tkwggtcA2mNHGl T5l2lZz8tJhyfhUuJm3vZjHbf7S3nhJBaVe3WihseokGKeRcC1ff5yTm14exQ1rnCwL1vU f9iiqA0ZtbOBGXTMyicRiLnBZyXE5YfeiLHEvCItP4ZMMEFYz4IQcvx0SE/wV6uLFqkA6O wukKgonuArzaS97TVQ4395G7OjulSc0MmtKTidj+ShffRTxfltcd9MryGdMvTg== 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 4NLXTL6rMQzm5X; Mon, 28 Nov 2022 17:27:02 +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 2ASHR2Hm081201; Mon, 28 Nov 2022 17:27:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ASHR2ZV081200; Mon, 28 Nov 2022 17:27:02 GMT (envelope-from git) Date: Mon, 28 Nov 2022 17:27:02 GMT Message-Id: <202211281727.2ASHR2ZV081200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: c4c522788720 - stable/13 - LinuxKPI: string.h implement memcpy_and_pad() 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: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c4c5227887205f4a0d17b8f560f856ea79eb18ab Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c4c5227887205f4a0d17b8f560f856ea79eb18ab commit c4c5227887205f4a0d17b8f560f856ea79eb18ab Author: Bjoern A. Zeeb AuthorDate: 2022-10-31 22:17:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-11-28 16:30:57 +0000 LinuxKPI: string.h implement memcpy_and_pad() Add a memcpy variant which takes length of source and destination buffers and a padding character in case there is free space in the destination. This is used by a wireless driver. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D37226 (cherry picked from commit 6a647ae51409cd56cc4a78d0a64ba3ff3aa3aac0) --- sys/compat/linuxkpi/common/include/linux/string.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/string.h b/sys/compat/linuxkpi/common/include/linux/string.h index 7a118bb17c48..c721ea6bab9d 100644 --- a/sys/compat/linuxkpi/common/include/linux/string.h +++ b/sys/compat/linuxkpi/common/include/linux/string.h @@ -227,4 +227,17 @@ memset_p(void **p, void *v, size_t n) return (memset64((uint64_t *)p, (uintptr_t)v, n)); } +static inline void +memcpy_and_pad(void *dst, size_t dstlen, const void *src, size_t len, int ch) +{ + + if (len >= dstlen) { + memcpy(dst, src, dstlen); + } else { + memcpy(dst, src, len); + /* Pad with given padding character. */ + memset((char *)dst + len, ch, dstlen - len); + } +} + #endif /* _LINUXKPI_LINUX_STRING_H_ */