[COMMITTED,1/1] malloc: fix typo "accomodate" should be "accommodate"

Message ID CAPWxxEVPhdnOUxyPaKR=EfbO0Y2=0D+oL4k5u5HK=io=xjt+TQ@mail.gmail.com
State New
Headers show
Series
  • [COMMITTED,1/1] malloc: fix typo "accomodate" should be "accommodate"
Related show

Commit Message

Szabolcs Nagy via Libc-alpha June 1, 2021, 6:57 a.m.
Hi,
I'm a newbie to glibc contribution. I've followed the Contribution
checklist but I'm not sure if I've done the right thing.
I've not completed the FSF Copyright Assignment. I've read that
"Copyright assignment for commulative changes by any one author of
less than 15 lines do not require copyright assignment.".
-- >8 --
---
 malloc/malloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 _Static_assert (__MTAG_GRANULE_SIZE <= CHUNK_HDR_SZ,
-- 
2.31.1

Comments

Paul Zimmermann June 1, 2021, 7:23 a.m. | #1
Hi Xeonacid,

if you look for similar typos with "git grep accomodate", you will find another
one in manual/summary.pl (excluding those in ChangeLog).
Please can you fix both in the same time (this should not exceed the 15-line
limit)?

Best regards,
Paul Zimmermann
Szabolcs Nagy via Libc-alpha June 1, 2021, 7:42 a.m. | #2
Hi Paul,
Here's my new patch. Thanks for your review.

On Tue, Jun 1, 2021 at 3:23 PM Paul Zimmermann <Paul.Zimmermann@inria.fr> wrote:
>

>        Hi Xeonacid,

>

> if you look for similar typos with "git grep accomodate", you will find another

> one in manual/summary.pl (excluding those in ChangeLog).

> Please can you fix both in the same time (this should not exceed the 15-line

> limit)?

>

> Best regards,

> Paul Zimmermann
From c77023b9ff19dc9f964849ae29e6098525720f12 Mon Sep 17 00:00:00 2001
From: Xeonacid <h.dwwwwww@gmail.com>
Date: Tue, 1 Jun 2021 14:18:47 +0800
Subject: [COMMITTED 1/1] fix typo
To: libc-alpha@sourceware.org
Cc: carlos@systemhalted.org

"accomodate" should be "accommodate"
---
 malloc/malloc.c   | 2 +-
 manual/summary.pl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/malloc/malloc.c b/malloc/malloc.c
index e2d7b1b583..0e2e1747e0 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1477,7 +1477,7 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1)
     chunksize (p) - CHUNK_HDR_SZ :                                    \
     chunksize (p) - CHUNK_HDR_SZ + (chunk_is_mmapped (p) ? 0 : SIZE_SZ))
 
-/* If memory tagging is enabled the layout changes to accomodate the granule
+/* If memory tagging is enabled the layout changes to accommodate the granule
    size, this is wasteful for small allocations so not done by default.
    Both the chunk header and user data has to be granule aligned.  */
 _Static_assert (__MTAG_GRANULE_SIZE <= CHUNK_HDR_SZ,
diff --git a/manual/summary.pl b/manual/summary.pl
index 4319c56415..ab0801b045 100755
--- a/manual/summary.pl
+++ b/manual/summary.pl
@@ -374,7 +374,7 @@ outside @*x lists ("Misplaced @standardsx").  "Spurious @standardsx"
 refers to otherwise valid @standardsx macros that were not matched to
 an element in an @*x list.  "Invalid syntax" means just that.
 
-The syntax of @standards annotations is designed to accomodate
+The syntax of @standards annotations is designed to accommodate
 multiple header and standards annotations, as necessary.
 
 Examples:
Paul Zimmermann June 1, 2021, 8:09 a.m. | #3
this looks good to me, thank you for your contribution!

Paul

Reviewed-by: paul.zimmermann@inria.fr


> From: Xeonacid <h.dwwwwww@gmail.com>

> Date: Tue, 1 Jun 2021 15:42:25 +0800

> Cc: libc-alpha@sourceware.org

> 

> 

> [1:text/plain Hide]

> 

> Hi Paul,

> Here's my new patch. Thanks for your review.

> 

> On Tue, Jun 1, 2021 at 3:23 PM Paul Zimmermann <Paul.Zimmermann@inria.fr> wrote:

> >

> >        Hi Xeonacid,

> >

> > if you look for similar typos with "git grep accomodate", you will find another

> > one in manual/summary.pl (excluding those in ChangeLog).

> > Please can you fix both in the same time (this should not exceed the 15-line

> > limit)?

> >

> > Best regards,

> > Paul Zimmermann

> 

> [2:text/x-patch Show Save:0001-fix-typo.patch (2kB)]

>
Paul Zimmermann June 2, 2021, 8 a.m. | #4
Dear Xeonacid,

> Here's my new patch. Thanks for your review.


your patch is ill-formed, I cannot apply it as it is, as requested to avoid
losing the author information. Please could you resend it fixed?

* you should provide an accurate commit message that matches the changes
* the subject should not contain [COMMITTED 1/1] but instead [PATCH]

To produce a correct patch, please use git format-patch to produce the
patch, and then git send-email to send it.

Best regards,
Paul

Patch

From 84ec52fad96826c874405d1d3c22176a22791cc5 Mon Sep 17 00:00:00 2001
From: Xeonacid <xeonacid@hit.edu.cn>
Date: Tue, 1 Jun 2021 14:18:47 +0800
Subject: [COMMITTED 1/1] malloc: fix typo "accomodate" should be "accommodate"
To: libc-alpha@sourceware.org
Cc: carlos@systemhalted.org

Hi,
I'm a newbie to glibc contribution. I've followed the Contribution checklist but I'm not sure if I've done the right thing.
I've not completed the FSF Copyright Assignment. I've read that "Copyright assignment for commulative changes by any one author of less than 15 lines do not require copyright assignment.".
-- >8 --
---
 malloc/malloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/malloc/malloc.c b/malloc/malloc.c
index e2d7b1b583..0e2e1747e0 100644
--- a/malloc/malloc.c
+++ b/malloc/malloc.c
@@ -1477,7 +1477,7 @@  checked_request2size (size_t req, size_t *sz) __nonnull (1)
     chunksize (p) - CHUNK_HDR_SZ :                                    \
     chunksize (p) - CHUNK_HDR_SZ + (chunk_is_mmapped (p) ? 0 : SIZE_SZ))
 
-/* If memory tagging is enabled the layout changes to accomodate the granule
+/* If memory tagging is enabled the layout changes to accommodate the granule
    size, this is wasteful for small allocations so not done by default.
    Both the chunk header and user data has to be granule aligned.  */
 _Static_assert (__MTAG_GRANULE_SIZE <= CHUNK_HDR_SZ,
-- 
2.31.1