| Message ID | 87r0d6pdlu.fsf@posteo.net |
|---|---|
| State | New |
| Headers | show |
| Series | <stdio.h>: Remove comment about getline(3) not being in POSIX | expand |
Philip Kaludercic <philipk@posteo.net> writes: > Hi, > > The current comment stems from 2003[0, 2c008571c3a], and unless I am > missing something should have been removed with the addition of getline > in POSIX.1-2008. Please include this commentary in the commit message. > > [2. [PATCH] <stdio.h>: Remove comment about getline(3) not being in POSIX --- text/x-patch; 0001-stdio-h---Remove-comment-about-getline-3--not-bei.patch]... > > > [0] https://sourceware.org/git/?p=glibc.git;a=commit;h=2c008571c3a
Sam James <sam@gentoo.org> writes: > Philip Kaludercic <philipk@posteo.net> writes: > >> Hi, >> >> The current comment stems from 2003[0, 2c008571c3a], and unless I am >> missing something should have been removed with the addition of getline >> in POSIX.1-2008. > > Please include this commentary in the commit message. Sure, here is the updated version: > >> >> [2. [PATCH] <stdio.h>: Remove comment about getline(3) not being in >> POSIX --- text/x-patch; >> 0001-stdio-h---Remove-comment-about-getline-3--not-bei.patch]... >> >> >> [0] https://sourceware.org/git/?p=glibc.git;a=commit;h=2c008571c3a >
Philip Kaludercic <philipk@posteo.net> writes: > Sam James <sam@gentoo.org> writes: > >> Philip Kaludercic <philipk@posteo.net> writes: >> >>> Hi, >>> >>> The current comment stems from 2003[0, 2c008571c3a], and unless I am >>> missing something should have been removed with the addition of getline >>> in POSIX.1-2008. >> >> Please include this commentary in the commit message. > > Sure, here is the updated version: Thanks. > > [2. text/x-diff; 0001-stdio.h-Remove-comment-about-getline-3-not-being-in-.patch] > From 6502738a3df65a6e929d11963ff2c0cd1952f7a3 Mon Sep 17 00:00:00 2001 > From: Philip Kaludercic <philipk@posteo.net> > Date: Sun, 9 Jun 2024 13:14:59 +0200 > Subject: [PATCH] <stdio.h>: Remove comment about getline(3) not being in POSIX > > The comment was written in 2003 (added in 2c008571c3a), predating the > addition of getline(3) in POSIX.1-2008. > --- > libio/stdio.h | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) Reviewed-by: Sam James <sam@gentoo.org> (I don't see the need to keep the old comment given it's now standardised; anyone can look up that it's (not) a cancellation point now, as it's not a glibc decision.) > > diff --git a/libio/stdio.h b/libio/stdio.h > index cbecabe1d9..a9dfd38c70 100644 > --- a/libio/stdio.h > +++ b/libio/stdio.h > @@ -698,12 +698,7 @@ extern __ssize_t getdelim (char **__restrict __lineptr, > size_t *__restrict __n, int __delimiter, > FILE *__restrict __stream) __wur __nonnull ((4)); > > -/* Like `getdelim', but reads up to a newline. > - > - This function is not part of POSIX and therefore no official > - cancellation point. But due to similarity with an POSIX interface > - or due to the implementation it is a cancellation point and > - therefore not marked with __THROW. */ > +/* Like `getdelim', but reads up to a newline. */ > extern __ssize_t getline (char **__restrict __lineptr, > size_t *__restrict __n, > FILE *__restrict __stream) __wur __nonnull ((3)); > -- > 2.39.2 > > >> >>> >>> [2. [PATCH] <stdio.h>: Remove comment about getline(3) not being in >>> POSIX --- text/x-patch; >>> 0001-stdio-h---Remove-comment-about-getline-3--not-bei.patch]... >>> >>> >>> [0] https://sourceware.org/git/?p=glibc.git;a=commit;h=2c008571c3a >>
Sam James <sam@gentoo.org> writes: > Philip Kaludercic <philipk@posteo.net> writes: > >> Sam James <sam@gentoo.org> writes: >> >>> Philip Kaludercic <philipk@posteo.net> writes: >>> >>>> Hi, >>>> >>>> The current comment stems from 2003[0, 2c008571c3a], and unless I am >>>> missing something should have been removed with the addition of getline >>>> in POSIX.1-2008. >>> >>> Please include this commentary in the commit message. >> >> Sure, here is the updated version: > > Thanks. > >> >> [2. text/x-diff; 0001-stdio.h-Remove-comment-about-getline-3-not-being-in-.patch] >> From 6502738a3df65a6e929d11963ff2c0cd1952f7a3 Mon Sep 17 00:00:00 2001 >> From: Philip Kaludercic <philipk@posteo.net> >> Date: Sun, 9 Jun 2024 13:14:59 +0200 >> Subject: [PATCH] <stdio.h>: Remove comment about getline(3) not being in POSIX >> >> The comment was written in 2003 (added in 2c008571c3a), predating the >> addition of getline(3) in POSIX.1-2008. >> --- >> libio/stdio.h | 7 +------ >> 1 file changed, 1 insertion(+), 6 deletions(-) > > Reviewed-by: Sam James <sam@gentoo.org> > > (I don't see the need to keep the old comment given it's now > standardised; anyone can look up that it's (not) a cancellation point > now, as it's not a glibc decision.) (not __throw)* > >> >> diff --git a/libio/stdio.h b/libio/stdio.h >> index cbecabe1d9..a9dfd38c70 100644 >> --- a/libio/stdio.h >> +++ b/libio/stdio.h >> @@ -698,12 +698,7 @@ extern __ssize_t getdelim (char **__restrict __lineptr, >> size_t *__restrict __n, int __delimiter, >> FILE *__restrict __stream) __wur __nonnull ((4)); >> >> -/* Like `getdelim', but reads up to a newline. >> - >> - This function is not part of POSIX and therefore no official >> - cancellation point. But due to similarity with an POSIX interface >> - or due to the implementation it is a cancellation point and >> - therefore not marked with __THROW. */ >> +/* Like `getdelim', but reads up to a newline. */ >> extern __ssize_t getline (char **__restrict __lineptr, >> size_t *__restrict __n, >> FILE *__restrict __stream) __wur __nonnull ((3)); >> -- >> 2.39.2 >> >> >>> >>>> >>>> [2. [PATCH] <stdio.h>: Remove comment about getline(3) not being in >>>> POSIX --- text/x-patch; >>>> 0001-stdio-h---Remove-comment-about-getline-3--not-bei.patch]... >>>> >>>> >>>> [0] https://sourceware.org/git/?p=glibc.git;a=commit;h=2c008571c3a >>>
Sam James <sam@gentoo.org> writes: > Philip Kaludercic <philipk@posteo.net> writes: > >> Sam James <sam@gentoo.org> writes: >> >>> Philip Kaludercic <philipk@posteo.net> writes: >>> >>>> Hi, >>>> >>>> The current comment stems from 2003[0, 2c008571c3a], and unless I am >>>> missing something should have been removed with the addition of getline >>>> in POSIX.1-2008. >>> >>> Please include this commentary in the commit message. >> >> Sure, here is the updated version: > > Thanks. > >> >> [2. text/x-diff; 0001-stdio.h-Remove-comment-about-getline-3-not-being-in-.patch] >> From 6502738a3df65a6e929d11963ff2c0cd1952f7a3 Mon Sep 17 00:00:00 2001 >> From: Philip Kaludercic <philipk@posteo.net> >> Date: Sun, 9 Jun 2024 13:14:59 +0200 >> Subject: [PATCH] <stdio.h>: Remove comment about getline(3) not being in POSIX >> >> The comment was written in 2003 (added in 2c008571c3a), predating the >> addition of getline(3) in POSIX.1-2008. >> --- >> libio/stdio.h | 7 +------ >> 1 file changed, 1 insertion(+), 6 deletions(-) > > Reviewed-by: Sam James <sam@gentoo.org> Should I add this to the commit as well? > (I don't see the need to keep the old comment given it's now > standardised; anyone can look up that it's (not) a cancellation point > now, as it's not a glibc decision.) What change are you suggesting? Also, I just noticed there is a similar comment a few lines above wrt. getdelim that should also be updated: >> >> diff --git a/libio/stdio.h b/libio/stdio.h >> index cbecabe1d9..a9dfd38c70 100644 >> --- a/libio/stdio.h >> +++ b/libio/stdio.h >> @@ -698,12 +698,7 @@ extern __ssize_t getdelim (char **__restrict __lineptr, >> size_t *__restrict __n, int __delimiter, >> FILE *__restrict __stream) __wur __nonnull ((4)); >> >> -/* Like `getdelim', but reads up to a newline. >> - >> - This function is not part of POSIX and therefore no official >> - cancellation point. But due to similarity with an POSIX interface >> - or due to the implementation it is a cancellation point and >> - therefore not marked with __THROW. */ >> +/* Like `getdelim', but reads up to a newline. */ >> extern __ssize_t getline (char **__restrict __lineptr, >> size_t *__restrict __n, >> FILE *__restrict __stream) __wur __nonnull ((3)); >> -- >> 2.39.2 >> >> >>> >>>> >>>> [2. [PATCH] <stdio.h>: Remove comment about getline(3) not being in >>>> POSIX --- text/x-patch; >>>> 0001-stdio-h---Remove-comment-about-getline-3--not-bei.patch]... >>>> >>>> >>>> [0] https://sourceware.org/git/?p=glibc.git;a=commit;h=2c008571c3a >>> >
Sam James <sam@gentoo.org> writes: > Philip Kaludercic <philipk@posteo.net> writes: > >> Sam James <sam@gentoo.org> writes: >> >>> Philip Kaludercic <philipk@posteo.net> writes: >>> >>>> Hi, >>>> >>>> The current comment stems from 2003[0, 2c008571c3a], and unless I am >>>> missing something should have been removed with the addition of getline >>>> in POSIX.1-2008. >>> >>> Please include this commentary in the commit message. >> >> Sure, here is the updated version: > > Thanks. > >> >> [2. text/x-diff; 0001-stdio.h-Remove-comment-about-getline-3-not-being-in-.patch] >> From 6502738a3df65a6e929d11963ff2c0cd1952f7a3 Mon Sep 17 00:00:00 2001 >> From: Philip Kaludercic <philipk@posteo.net> >> Date: Sun, 9 Jun 2024 13:14:59 +0200 >> Subject: [PATCH] <stdio.h>: Remove comment about getline(3) not being in POSIX >> >> The comment was written in 2003 (added in 2c008571c3a), predating the >> addition of getline(3) in POSIX.1-2008. >> --- >> libio/stdio.h | 7 +------ >> 1 file changed, 1 insertion(+), 6 deletions(-) > > Reviewed-by: Sam James <sam@gentoo.org> Should I add this to the commit as well? > (I don't see the need to keep the old comment given it's now > standardised; anyone can look up that it's (not) a cancellation point > now, as it's not a glibc decision.) What change are you suggesting? Also, I just noticed there is a similar comment a few lines above wrt. getdelim that should also be updated: >> >> diff --git a/libio/stdio.h b/libio/stdio.h >> index cbecabe1d9..a9dfd38c70 100644 >> --- a/libio/stdio.h >> +++ b/libio/stdio.h >> @@ -698,12 +698,7 @@ extern __ssize_t getdelim (char **__restrict __lineptr, >> size_t *__restrict __n, int __delimiter, >> FILE *__restrict __stream) __wur __nonnull ((4)); >> >> -/* Like `getdelim', but reads up to a newline. >> - >> - This function is not part of POSIX and therefore no official >> - cancellation point. But due to similarity with an POSIX interface >> - or due to the implementation it is a cancellation point and >> - therefore not marked with __THROW. */ >> +/* Like `getdelim', but reads up to a newline. */ >> extern __ssize_t getline (char **__restrict __lineptr, >> size_t *__restrict __n, >> FILE *__restrict __stream) __wur __nonnull ((3)); >> -- >> 2.39.2 >> >> >>> >>>> >>>> [2. [PATCH] <stdio.h>: Remove comment about getline(3) not being in >>>> POSIX --- text/x-patch; >>>> 0001-stdio-h---Remove-comment-about-getline-3--not-bei.patch]... >>>> >>>> >>>> [0] https://sourceware.org/git/?p=glibc.git;a=commit;h=2c008571c3a >>> >
Philip Kaludercic <philipk@posteo.net> writes: > Sam James <sam@gentoo.org> writes: > >> Philip Kaludercic <philipk@posteo.net> writes: >> >>> Sam James <sam@gentoo.org> writes: >>> >>>> Philip Kaludercic <philipk@posteo.net> writes: >>>> >>>>> Hi, >>>>> >>>>> The current comment stems from 2003[0, 2c008571c3a], and unless I am >>>>> missing something should have been removed with the addition of getline >>>>> in POSIX.1-2008. >>>> >>>> Please include this commentary in the commit message. >>> >>> Sure, here is the updated version: >> >> Thanks. >> >>> >>> [2. text/x-diff; 0001-stdio.h-Remove-comment-about-getline-3-not-being-in-.patch] >>> From 6502738a3df65a6e929d11963ff2c0cd1952f7a3 Mon Sep 17 00:00:00 2001 >>> From: Philip Kaludercic <philipk@posteo.net> >>> Date: Sun, 9 Jun 2024 13:14:59 +0200 >>> Subject: [PATCH] <stdio.h>: Remove comment about getline(3) not being in POSIX >>> >>> The comment was written in 2003 (added in 2c008571c3a), predating the >>> addition of getline(3) in POSIX.1-2008. >>> --- >>> libio/stdio.h | 7 +------ >>> 1 file changed, 1 insertion(+), 6 deletions(-) >> >> Reviewed-by: Sam James <sam@gentoo.org> > > Should I add this to the commit as well? If you have a reason to send a new version, yes, if you didn't substantially change it. If not, no, and whoever merges (possibly me, but let's allow others to comment first) will include any tags like this. > >> (I don't see the need to keep the old comment given it's now >> standardised; anyone can look up that it's (not) a cancellation point >> now, as it's not a glibc decision.) > > What change are you suggesting? Also, I just noticed there is a similar > comment a few lines above wrt. getdelim that should also be updated: Sorry, I was saying "your change is fine and this is why". I wasn't clear enough. The new patch still LGTM, let's give it a little bit for further comments. > > [2. text/x-diff; 0001-stdio.h-Acknowledge-that-getdelim-getline-are-in-POS.patch] > From 86e9db5c265432446fcd727973eb6fe4e4ce2d8a Mon Sep 17 00:00:00 2001 > From: Philip Kaludercic <philipk@posteo.net> > Date: Sun, 9 Jun 2024 13:14:59 +0200 > Subject: [PATCH] <stdio.h>: Acknowledge that getdelim/getline are in POSIX > > These comments were written in 2003 (added in 2c008571c3a), predating > the addition of getdelim(3)/getline(3) in POSIX.1-2008. > > Reviewed-by: Sam James <sam@gentoo.org> > --- > libio/stdio.h | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > > diff --git a/libio/stdio.h b/libio/stdio.h > index cbecabe1d9..da9d4eebcf 100644 > --- a/libio/stdio.h > +++ b/libio/stdio.h > @@ -685,12 +685,7 @@ extern char *fgets_unlocked (char *__restrict __s, int __n, > (and null-terminate it). *LINEPTR is a pointer returned from malloc (or > NULL), pointing to *N characters of space. It is realloc'd as > necessary. Returns the number of characters read (not including the > - null terminator), or -1 on error or EOF. > - > - These functions are not part of POSIX and therefore no official > - cancellation point. But due to similarity with an POSIX interface > - or due to the implementation they are cancellation points and > - therefore not marked with __THROW. */ > + null terminator), or -1 on error or EOF. */ > extern __ssize_t __getdelim (char **__restrict __lineptr, > size_t *__restrict __n, int __delimiter, > FILE *__restrict __stream) __wur __nonnull ((4)); > @@ -698,12 +693,7 @@ extern __ssize_t getdelim (char **__restrict __lineptr, > size_t *__restrict __n, int __delimiter, > FILE *__restrict __stream) __wur __nonnull ((4)); > > -/* Like `getdelim', but reads up to a newline. > - > - This function is not part of POSIX and therefore no official > - cancellation point. But due to similarity with an POSIX interface > - or due to the implementation it is a cancellation point and > - therefore not marked with __THROW. */ > +/* Like `getdelim', but reads up to a newline. */ > extern __ssize_t getline (char **__restrict __lineptr, > size_t *__restrict __n, > FILE *__restrict __stream) __wur __nonnull ((3)); > -- > 2.39.2 > > >>> >>> diff --git a/libio/stdio.h b/libio/stdio.h >>> index cbecabe1d9..a9dfd38c70 100644 >>> --- a/libio/stdio.h >>> +++ b/libio/stdio.h >>> @@ -698,12 +698,7 @@ extern __ssize_t getdelim (char **__restrict __lineptr, >>> size_t *__restrict __n, int __delimiter, >>> FILE *__restrict __stream) __wur __nonnull ((4)); >>> >>> -/* Like `getdelim', but reads up to a newline. >>> - >>> - This function is not part of POSIX and therefore no official >>> - cancellation point. But due to similarity with an POSIX interface >>> - or due to the implementation it is a cancellation point and >>> - therefore not marked with __THROW. */ >>> +/* Like `getdelim', but reads up to a newline. */ >>> extern __ssize_t getline (char **__restrict __lineptr, >>> size_t *__restrict __n, >>> FILE *__restrict __stream) __wur __nonnull ((3)); >>> -- >>> 2.39.2 >>> >>> >>>> >>>>> >>>>> [2. [PATCH] <stdio.h>: Remove comment about getline(3) not being in >>>>> POSIX --- text/x-patch; >>>>> 0001-stdio-h---Remove-comment-about-getline-3--not-bei.patch]... >>>>> >>>>> >>>>> [0] https://sourceware.org/git/?p=glibc.git;a=commit;h=2c008571c3a >>>> >>
* Sam James: > Philip Kaludercic <philipk@posteo.net> writes: > >> Sam James <sam@gentoo.org> writes: >> >>> Philip Kaludercic <philipk@posteo.net> writes: >>> >>>> Sam James <sam@gentoo.org> writes: >>>> >>>>> Philip Kaludercic <philipk@posteo.net> writes: >>>>> >>>>>> Hi, >>>>>> >>>>>> The current comment stems from 2003[0, 2c008571c3a], and unless I am >>>>>> missing something should have been removed with the addition of getline >>>>>> in POSIX.1-2008. >>>>> >>>>> Please include this commentary in the commit message. >>>> >>>> Sure, here is the updated version: >>> >>> Thanks. >>> >>>> >>>> [2. text/x-diff; 0001-stdio.h-Remove-comment-about-getline-3-not-being-in-.patch] >>>> From 6502738a3df65a6e929d11963ff2c0cd1952f7a3 Mon Sep 17 00:00:00 2001 >>>> From: Philip Kaludercic <philipk@posteo.net> >>>> Date: Sun, 9 Jun 2024 13:14:59 +0200 >>>> Subject: [PATCH] <stdio.h>: Remove comment about getline(3) not being in POSIX >>>> >>>> The comment was written in 2003 (added in 2c008571c3a), predating the >>>> addition of getline(3) in POSIX.1-2008. >>>> --- >>>> libio/stdio.h | 7 +------ >>>> 1 file changed, 1 insertion(+), 6 deletions(-) >>> >>> Reviewed-by: Sam James <sam@gentoo.org> >> >> Should I add this to the commit as well? > > If you have a reason to send a new version, yes, if you didn't > substantially change it. If not, no, and whoever merges (possibly me, > but let's allow others to comment first) will include any tags like this. The latest version looks okay to me too. Thanks, Florian
Florian Weimer <fweimer@redhat.com> writes: > * Sam James: > >> Philip Kaludercic <philipk@posteo.net> writes: >> >>> Sam James <sam@gentoo.org> writes: >>> >>>> Philip Kaludercic <philipk@posteo.net> writes: >>>> >>>>> Sam James <sam@gentoo.org> writes: >>>>> >>>>>> Philip Kaludercic <philipk@posteo.net> writes: >>>>>> >>>>>>> Hi, >>>>>>> >>>>>>> The current comment stems from 2003[0, 2c008571c3a], and unless I am >>>>>>> missing something should have been removed with the addition of getline >>>>>>> in POSIX.1-2008. >>>>>> >>>>>> Please include this commentary in the commit message. >>>>> >>>>> Sure, here is the updated version: >>>> >>>> Thanks. >>>> >>>>> >>>>> [2. text/x-diff; 0001-stdio.h-Remove-comment-about-getline-3-not-being-in-.patch] >>>>> From 6502738a3df65a6e929d11963ff2c0cd1952f7a3 Mon Sep 17 00:00:00 2001 >>>>> From: Philip Kaludercic <philipk@posteo.net> >>>>> Date: Sun, 9 Jun 2024 13:14:59 +0200 >>>>> Subject: [PATCH] <stdio.h>: Remove comment about getline(3) not being in POSIX >>>>> >>>>> The comment was written in 2003 (added in 2c008571c3a), predating the >>>>> addition of getline(3) in POSIX.1-2008. >>>>> --- >>>>> libio/stdio.h | 7 +------ >>>>> 1 file changed, 1 insertion(+), 6 deletions(-) >>>> >>>> Reviewed-by: Sam James <sam@gentoo.org> >>> >>> Should I add this to the commit as well? >> >> If you have a reason to send a new version, yes, if you didn't >> substantially change it. If not, no, and whoever merges (possibly me, >> but let's allow others to comment first) will include any tags like this. > > The latest version looks okay to me too. Thanks! Merged with r-b added.
From a58894c03d34f7caac9afa5303aa5ae499edaaaf Mon Sep 17 00:00:00 2001 From: Philip Kaludercic <philipk@posteo.net> Date: Sun, 9 Jun 2024 13:14:59 +0200 Subject: [PATCH] <stdio.h>: Remove comment about getline(3) not being in POSIX --- libio/stdio.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libio/stdio.h b/libio/stdio.h index cbecabe1d9..a9dfd38c70 100644 --- a/libio/stdio.h +++ b/libio/stdio.h @@ -698,12 +698,7 @@ extern __ssize_t getdelim (char **__restrict __lineptr, size_t *__restrict __n, int __delimiter, FILE *__restrict __stream) __wur __nonnull ((4)); -/* Like `getdelim', but reads up to a newline. - - This function is not part of POSIX and therefore no official - cancellation point. But due to similarity with an POSIX interface - or due to the implementation it is a cancellation point and - therefore not marked with __THROW. */ +/* Like `getdelim', but reads up to a newline. */ extern __ssize_t getline (char **__restrict __lineptr, size_t *__restrict __n, FILE *__restrict __stream) __wur __nonnull ((3)); -- 2.39.2