Re: GNU C Library master sources branch, master, updated. glibc-2.14-493-g7583a88

[Thomas Schwinge <thomas at codesourcery dot com>]

Hi!

On 7 Nov 2011 14:28:59 -0000, schwab@sourceware.org wrote:
> http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=7583a88d1c7170caad26966bcea8bfc2c92093ba
> 
> commit 7583a88d1c7170caad26966bcea8bfc2c92093ba
> Author: Andreas Schwab <schwab@redhat.com>
> Date:   Mon Nov 7 15:07:31 2011 +0100
> 
>     Fix locking in _IO_flush_all_lockp

> --- a/libio/genops.c
> +++ b/libio/genops.c
> @@ -826,7 +826,7 @@ _IO_flush_all_lockp (int do_lock)
>    int last_stamp;
>  
>  #ifdef _IO_MTSAFE_IO
> -  _IO_cleanup_region_start_noarg (flush_cleanup);
> +  __libc_cleanup_region_start (do_lock, flush_cleanup, 0);
>    if (do_lock)
>      _IO_lock_lock (list_all_lock);
>  #endif
> @@ -866,7 +866,7 @@ _IO_flush_all_lockp (int do_lock)
>  #ifdef _IO_MTSAFE_IO
>    if (do_lock)
>      _IO_lock_unlock (list_all_lock);
> -  _IO_cleanup_region_end (0);
> +  __libc_cleanup_region_end (0);

This fix introduced a warning:

    genops.c: In function '_IO_flush_all_lockp':
    genops.c:869:3: warning: passing argument 1 of '__save_FCT' makes pointer from integer without a cast [enabled by default]
    genops.c:869:3: note: expected 'void *' but argument is of type 'int'

Pushed to master, as obvious:

commit 341dd67392b90af0e76913d0779b1bdafe64d1e4
Author: Thomas Schwinge <thomas@codesourcery.com>
Date:   Thu Nov 1 17:50:30 2012 +0100

    Change type of constant to avoid a warning.
    
    Warning has been introduced in commit 7583a88d1c7170caad26966bcea8bfc2c92093ba.

diff --git ChangeLog ChangeLog
index a042ebf..7024d8e 100644
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2012-11-01  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* libio/genops.c (_IO_flush_all_lockp): Use NULL rather than 0 for
+	__libc_cleanup_region_start argument.
+
 2012-11-01  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #14784]
diff --git libio/genops.c libio/genops.c
index 0a81a5d..61e59f9 100644
--- libio/genops.c
+++ libio/genops.c
@@ -822,7 +822,7 @@ _IO_flush_all_lockp (int do_lock)
   int last_stamp;
 
 #ifdef _IO_MTSAFE_IO
-  __libc_cleanup_region_start (do_lock, flush_cleanup, 0);
+  __libc_cleanup_region_start (do_lock, flush_cleanup, NULL);
   if (do_lock)
     _IO_lock_lock (list_all_lock);
 #endif


GrÃÃe,
 Thomas

Attachment: pgp00000.pgp
Description: PGP signature