[2/7] hurd: Move libc_hidden_def's around

Message ID 20230429131354.2507443-2-bugaevc@gmail.com
State Committed, archived
Headers
Series [1/7] hurd: Simplify _hurd_critical_section_lock a bit |

Checks

Context Check Description
dj/TryBot-apply_patch success Patch applied to master at the time it was sent

Commit Message

Sergey Bugaev April 29, 2023, 1:13 p.m. UTC
  Each libc_hidden_def should be placed immediately next to its function,
not in some random unrelated place.

No functional change.

Fixes: 653d74f12abea144219af00400ed1f1ac5dfa79f
"hurd: Global signal disposition"

Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
---
 hurd/hurdsig.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
  

Comments

Samuel Thibault April 29, 2023, 2:52 p.m. UTC | #1
Applied, thanks!

Sergey Bugaev via Libc-alpha, le sam. 29 avril 2023 16:13:49 +0300, a ecrit:
> Each libc_hidden_def should be placed immediately next to its function,
> not in some random unrelated place.
> 
> No functional change.
> 
> Fixes: 653d74f12abea144219af00400ed1f1ac5dfa79f
> "hurd: Global signal disposition"
> 
> Signed-off-by: Sergey Bugaev <bugaevc@gmail.com>
> ---
>  hurd/hurdsig.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
> index c84de4db..78ea59d9 100644
> --- a/hurd/hurdsig.c
> +++ b/hurd/hurdsig.c
> @@ -174,6 +174,7 @@ _hurd_sigstate_set_global_rcv (struct hurd_sigstate *ss)
>    assert (ss->thread != MACH_PORT_NULL);
>    ss->actions[0].sa_handler = SIG_IGN;
>  }
> +libc_hidden_def (_hurd_sigstate_set_global_rcv)
>  
>  /* Check whether SS is a global receiver.  */
>  static int
> @@ -193,6 +194,8 @@ _hurd_sigstate_lock (struct hurd_sigstate *ss)
>      __spin_lock (&_hurd_global_sigstate->lock);
>    __spin_lock (&ss->lock);
>  }
> +libc_hidden_def (_hurd_sigstate_lock)
> +
>  void
>  _hurd_sigstate_unlock (struct hurd_sigstate *ss)
>  {
> @@ -200,7 +203,7 @@ _hurd_sigstate_unlock (struct hurd_sigstate *ss)
>    if (sigstate_is_global_rcv (ss))
>      __spin_unlock (&_hurd_global_sigstate->lock);
>  }
> -libc_hidden_def (_hurd_sigstate_set_global_rcv)
> +libc_hidden_def (_hurd_sigstate_unlock)
>  
>  /* Retrieve a thread's full set of pending signals, including the global
>     ones if appropriate.  SS must be locked.  */
> @@ -212,6 +215,7 @@ _hurd_sigstate_pending (const struct hurd_sigstate *ss)
>      __sigorset (&pending, &pending, &_hurd_global_sigstate->pending);
>    return pending;
>  }
> +libc_hidden_def (_hurd_sigstate_pending)
>  
>  /* Clear a pending signal and return the associated detailed
>     signal information. SS must be locked, and must have signal SIGNO
> @@ -230,8 +234,6 @@ sigstate_clear_pending (struct hurd_sigstate *ss, int signo)
>    __sigdelset (&ss->pending, signo);
>    return ss->pending_data[signo];
>  }
> -libc_hidden_def (_hurd_sigstate_lock)
> -libc_hidden_def (_hurd_sigstate_unlock)
>  
>  /* Retrieve a thread's action vector.  SS must be locked.  */
>  struct sigaction *
> @@ -242,7 +244,6 @@ _hurd_sigstate_actions (struct hurd_sigstate *ss)
>    else
>      return ss->actions;
>  }
> -libc_hidden_def (_hurd_sigstate_pending)
>  
>  
>  /* Signal delivery itself is on this page.  */
> -- 
> 2.40.1
>
  

Patch

diff --git a/hurd/hurdsig.c b/hurd/hurdsig.c
index c84de4db..78ea59d9 100644
--- a/hurd/hurdsig.c
+++ b/hurd/hurdsig.c
@@ -174,6 +174,7 @@  _hurd_sigstate_set_global_rcv (struct hurd_sigstate *ss)
   assert (ss->thread != MACH_PORT_NULL);
   ss->actions[0].sa_handler = SIG_IGN;
 }
+libc_hidden_def (_hurd_sigstate_set_global_rcv)
 
 /* Check whether SS is a global receiver.  */
 static int
@@ -193,6 +194,8 @@  _hurd_sigstate_lock (struct hurd_sigstate *ss)
     __spin_lock (&_hurd_global_sigstate->lock);
   __spin_lock (&ss->lock);
 }
+libc_hidden_def (_hurd_sigstate_lock)
+
 void
 _hurd_sigstate_unlock (struct hurd_sigstate *ss)
 {
@@ -200,7 +203,7 @@  _hurd_sigstate_unlock (struct hurd_sigstate *ss)
   if (sigstate_is_global_rcv (ss))
     __spin_unlock (&_hurd_global_sigstate->lock);
 }
-libc_hidden_def (_hurd_sigstate_set_global_rcv)
+libc_hidden_def (_hurd_sigstate_unlock)
 
 /* Retrieve a thread's full set of pending signals, including the global
    ones if appropriate.  SS must be locked.  */
@@ -212,6 +215,7 @@  _hurd_sigstate_pending (const struct hurd_sigstate *ss)
     __sigorset (&pending, &pending, &_hurd_global_sigstate->pending);
   return pending;
 }
+libc_hidden_def (_hurd_sigstate_pending)
 
 /* Clear a pending signal and return the associated detailed
    signal information. SS must be locked, and must have signal SIGNO
@@ -230,8 +234,6 @@  sigstate_clear_pending (struct hurd_sigstate *ss, int signo)
   __sigdelset (&ss->pending, signo);
   return ss->pending_data[signo];
 }
-libc_hidden_def (_hurd_sigstate_lock)
-libc_hidden_def (_hurd_sigstate_unlock)
 
 /* Retrieve a thread's action vector.  SS must be locked.  */
 struct sigaction *
@@ -242,7 +244,6 @@  _hurd_sigstate_actions (struct hurd_sigstate *ss)
   else
     return ss->actions;
 }
-libc_hidden_def (_hurd_sigstate_pending)
 
 
 /* Signal delivery itself is on this page.  */