From nobody Sat May 18 18:02:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1699370333533275.11122918963895; Tue, 7 Nov 2023 07:18:53 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.628875.980773 (Exim 4.92) (envelope-from ) id 1r0NqH-0001z4-W3; Tue, 07 Nov 2023 15:18:13 +0000 Received: by outflank-mailman (output) from mailman id 628875.980773; Tue, 07 Nov 2023 15:18:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r0NqH-0001yx-TE; Tue, 07 Nov 2023 15:18:13 +0000 Received: by outflank-mailman (input) for mailman id 628875; Tue, 07 Nov 2023 15:18:12 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1r0NqG-0001xa-Ic for xen-devel@lists.xenproject.org; Tue, 07 Nov 2023 15:18:12 +0000 Received: from support.bugseng.com (mail.bugseng.com [162.55.131.47]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id dc708670-7d80-11ee-9b0e-b553b5be7939; Tue, 07 Nov 2023 16:18:10 +0100 (CET) Received: from Dell.bugseng.com (unknown [37.163.230.152]) by support.bugseng.com (Postfix) with ESMTPSA id B35AD4EE0747; Tue, 7 Nov 2023 16:18:08 +0100 (CET) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: dc708670-7d80-11ee-9b0e-b553b5be7939 From: Federico Serafini To: xen-devel@lists.xenproject.org Cc: consulting@bugseng.com, Federico Serafini , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu Subject: [XEN PATCH v3] xen/string: address violations of MISRA C:2012 Rules 8.2 and 8.3 Date: Tue, 7 Nov 2023 16:18:02 +0100 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1699370335946100001 Content-Type: text/plain; charset="utf-8" Add missing parameter names and make function declarations and definitions consistent. Mismatches between parameter names "count" and "n" are resolved in favor of "n", being the same name used by the C standard. No functional change. Signed-off-by: Federico Serafini Reviewed-by: Stefano Stabellini --- Changes in v3: - applied changes discussed in the following thread https://lists.xenproject.org/archives/html/xen-devel/2023-08/msg00318.h= tml Changes in v2: - memset() adjusted. --- xen/include/xen/string.h | 42 ++++++++++++++++++++-------------------- xen/lib/memcpy.c | 6 +++--- xen/lib/memmove.c | 12 ++++++------ xen/lib/memset.c | 6 +++--- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/xen/include/xen/string.h b/xen/include/xen/string.h index b4d2217a96..bd4a8f48e9 100644 --- a/xen/include/xen/string.h +++ b/xen/include/xen/string.h @@ -12,27 +12,27 @@ #define strncpy __xen_has_no_strncpy__ #define strncat __xen_has_no_strncat__ =20 -size_t strlcpy(char *, const char *, size_t); -size_t strlcat(char *, const char *, size_t); -int strcmp(const char *, const char *); -int strncmp(const char *, const char *, size_t); -int strcasecmp(const char *, const char *); -int strncasecmp(const char *, const char *, size_t); -char *strchr(const char *, int); -char *strrchr(const char *, int); -char *strstr(const char *, const char *); -size_t strlen(const char *); -size_t strnlen(const char *, size_t); -char *strpbrk(const char *, const char *); -char *strsep(char **, const char *); -size_t strspn(const char *, const char *); - -void *memset(void *, int, size_t); -void *memcpy(void *, const void *, size_t); -void *memmove(void *, const void *, size_t); -int memcmp(const void *, const void *, size_t); -void *memchr(const void *, int, size_t); -void *memchr_inv(const void *, int, size_t); +size_t strlcpy(char *dest, const char *src, size_t size); +size_t strlcat(char *dest, const char *src, size_t size); +int strcmp(const char *cs, const char *ct); +int strncmp(const char *cs, const char *ct, size_t count); +int strcasecmp(const char *s1, const char *s2); +int strncasecmp(const char *s1, const char *s2, size_t len); +char *strchr(const char *s, int c); +char *strrchr(const char *s, int c); +char *strstr(const char *s1, const char *s2); +size_t strlen(const char *s); +size_t strnlen(const char *s, size_t count); +char *strpbrk(const char *cs,const char *ct); +char *strsep(char **s, const char *ct); +size_t strspn(const char *s, const char *accept); + +void *memset(void *s, int c, size_t n); +void *memcpy(void *dest, const void *src, size_t n); +void *memmove(void *dest, const void *src, size_t n); +int memcmp(const void *cs, const void *ct, size_t count); +void *memchr(const void *s, int c, size_t n); +void *memchr_inv(const void *s, int c, size_t n); =20 #include =20 diff --git a/xen/lib/memcpy.c b/xen/lib/memcpy.c index afb322797d..5476121c0d 100644 --- a/xen/lib/memcpy.c +++ b/xen/lib/memcpy.c @@ -8,16 +8,16 @@ * memcpy - Copy one area of memory to another * @dest: Where to copy to * @src: Where to copy from - * @count: The size of the area. + * @n: The size of the area. * * You should not use this function to access IO space, use memcpy_toio() * or memcpy_fromio() instead. */ -void *(memcpy)(void *dest, const void *src, size_t count) +void *(memcpy)(void *dest, const void *src, size_t n) { char *tmp =3D (char *) dest, *s =3D (char *) src; =20 - while (count--) + while (n--) *tmp++ =3D *s++; =20 return dest; diff --git a/xen/lib/memmove.c b/xen/lib/memmove.c index 1ab79dfb28..99804352e6 100644 --- a/xen/lib/memmove.c +++ b/xen/lib/memmove.c @@ -8,23 +8,23 @@ * memmove - Copy one area of memory to another * @dest: Where to copy to * @src: Where to copy from - * @count: The size of the area. + * @n: The size of the area. * * Unlike memcpy(), memmove() copes with overlapping areas. */ -void *(memmove)(void *dest, const void *src, size_t count) +void *(memmove)(void *dest, const void *src, size_t n) { char *tmp, *s; =20 if (dest <=3D src) { tmp =3D (char *) dest; s =3D (char *) src; - while (count--) + while (n--) *tmp++ =3D *s++; } else { - tmp =3D (char *) dest + count; - s =3D (char *) src + count; - while (count--) + tmp =3D (char *) dest + n; + s =3D (char *) src + n; + while (n--) *--tmp =3D *--s; } =20 diff --git a/xen/lib/memset.c b/xen/lib/memset.c index e86afafd02..48a072cb51 100644 --- a/xen/lib/memset.c +++ b/xen/lib/memset.c @@ -8,15 +8,15 @@ * memset - Fill a region of memory with the given value * @s: Pointer to the start of the area. * @c: The byte to fill the area with - * @count: The size of the area. + * @n: The size of the area. * * Do not use memset() to access IO space, use memset_io() instead. */ -void *(memset)(void *s, int c, size_t count) +void *(memset)(void *s, int c, size_t n) { char *xs =3D (char *) s; =20 - while (count--) + while (n--) *xs++ =3D c; =20 return s; --=20 2.34.1