This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH v3 1/2] libio: fmemopen rewrite to POSIX compliance
- From: Adhemerval Zanella <azanella at linux dot vnet dot ibm dot com>
- To: libc-alpha at sourceware dot org
- Date: Thu, 12 Feb 2015 11:31:39 -0200
- Subject: Re: [PATCH v3 1/2] libio: fmemopen rewrite to POSIX compliance
- Authentication-results: sourceware.org; auth=none
- References: <54DBC63D dot 2020404 at linux dot vnet dot ibm dot com> <alpine dot DEB dot 2 dot 10 dot 1502112143310 dot 19244 at digraph dot polyomino dot org dot uk>
Hi Joseph,
Thanks for the review.
On 11-02-2015 19:45, Joseph Myers wrote:
> On Wed, 11 Feb 2015, Adhemerval Zanella wrote:
>
>> diff --git a/libio/fmemopen.c b/libio/fmemopen.c
>> index 6c50fba..181350b 100644
>> --- a/libio/fmemopen.c
>> +++ b/libio/fmemopen.c
>> @@ -1,7 +1,7 @@
>> -/* Fmemopen implementation.
>> - Copyright (C) 2000-2015 Free Software Foundation, Inc.
>> +/* fmemopen implementation.
>> + Copyright (C) 2015 Free Software Foundation, Inc.
>> +>>>>>>> libio: fmemopen rewrite to POSIX compliance
> This looks like a conflict marker.
Ugh, it is and I have removed it.
>
>> diff --git a/libio/oldfmemopen.c b/libio/oldfmemopen.c
>> new file mode 100644
>> index 0000000..88f8473
>> --- /dev/null
>> +++ b/libio/oldfmemopen.c
>> @@ -0,0 +1,265 @@
>> +/* Fmemopen implementation.
>> + Copyright (C) 2000-2014 Free Software Foundation, Inc.
> 2015 - make sure no other changes to the old file have been lost....
Fixed.
>
>> diff --git a/stdio-common/tst-fmemopen3.c b/stdio-common/tst-fmemopen3.c
>> new file mode 100644
>> index 0000000..8cd211f
>> --- /dev/null
>> +++ b/stdio-common/tst-fmemopen3.c
>> @@ -0,0 +1,206 @@
>> +/* fmemopen tests for append and read mode.
>> + Copyright (C) 2014 Free Software Foundation, Inc.
> 2015.
>
Fixed.
With the comments fix, is this patch ok to push?