[PATCH] proc: rename "catch" function argument

* [PATCH] proc: rename "catch" function argument
@ 2020-03-31 21:09 Alexey Dobriyan
  2020-04-16  4:07 ` Andrew Morton
  0 siblings, 1 reply; 4+ messages in thread
From: Alexey Dobriyan @ 2020-03-31 21:09 UTC (permalink / raw)
  To: akpm; +Cc: linux-kernel, linux-fsdevel

"catch" is reserved keyword in C++, rename it to something
both gcc and g++ accept.

Rename "ign" for symmetry.

Signed-off-by: _Z6Alexeyv <adobriyan@gmail.com>
---

 fs/proc/array.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -248,8 +248,8 @@ void render_sigset_t(struct seq_file *m, const char *header,
 	seq_putc(m, '\n');
 }
 
-static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
-				    sigset_t *catch)
+static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *sigign,
+				    sigset_t *sigcatch)
 {
 	struct k_sigaction *k;
 	int i;
@@ -257,9 +257,9 @@ static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
 	k = p->sighand->action;
 	for (i = 1; i <= _NSIG; ++i, ++k) {
 		if (k->sa.sa_handler == SIG_IGN)
-			sigaddset(ign, i);
+			sigaddset(sigign, i);
 		else if (k->sa.sa_handler != SIG_DFL)
-			sigaddset(catch, i);
+			sigaddset(sigcatch, i);
 	}
 }
 

^ permalink raw reply	[flat|nested] 4+ messages in thread