Rename sys_sig[gs]etmask to sys_s[gs]etmask to match syscall names

* signal.c (SYS_FUNC(sigsetmask)): Rename to SYS_FUNC(ssetmask).
(SYS_FUNC(siggetmask)): Rename to SYS_FUNC(sgetmask).
* linux/arm/syscallent.h (sgetmask, ssetmask): Update sys_func.
* linux/bfin/syscallent.h: Likewise.
* linux/crisv10/syscallent.h: Likewise.
* linux/hppa/syscallent.h: Likewise.
* linux/i386/syscallent.h: Likewise.
* linux/m68k/syscallent.h: Likewise.
* linux/microblaze/syscallent.h: Likewise.
* linux/mips/syscallent-o32.h: Likewise.
* linux/powerpc/syscallent.h: Likewise.
* linux/powerpc64/syscallent.h: Likewise.
* linux/sh/syscallent.h: Likewise.
* linux/sh64/syscallent.h: Likewise.
* linux/sparc/syscallent.h: Likewise.
* linux/sparc64/syscallent.h: Likewise.

diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
index 8e47e642526c9244bcde40821979fbe374adbd83..f9e7dbd43d6538b83b4be6c353be1d5067574456 100644 (file)
--- a/linux/arm/syscallent.h
+++ b/linux/arm/syscallent.h
@@ -94,8 +94,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid16),                "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid16),                "setregid"              },
 [ 72] = { 3,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h
index ec51f6c9e5ac1a7a3e482e9383b5127f6b5163dd..9be23d9dc1ccc4813587856e46a34cbae31d3d6f 100644 (file)
--- a/linux/bfin/syscallent.h
+++ b/linux/bfin/syscallent.h
@@ -94,8 +94,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid16),                "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid16),                "setregid"              },
 [ 72] = { 3,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/crisv10/syscallent.h b/linux/crisv10/syscallent.h
index c384a8bc35d50ecf03ed3e49ea83378777d6392c..0e36774c2536804452c40e9f1532c08f919d359d 100644 (file)
--- a/linux/crisv10/syscallent.h
+++ b/linux/crisv10/syscallent.h
@@ -66,8 +66,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid16),                "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid16),                "setregid"              },
 [ 72] = { 1,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h
index 59d75a6ba1f756a1267897ec269c3f492456f855..ccff2a4ca298c50d856d9b579ce687ed3650b988 100644 (file)
--- a/linux/hppa/syscallent.h
+++ b/linux/hppa/syscallent.h
@@ -70,8 +70,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 2,   TF,             SEN(pivotroot),                 "pivot_root"            },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid),                  "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid),                  "setregid"              },
 [ 72] = { 3,   TM,             SEN(mincore),                   "mincore"               },

diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h
index 27c11b665a58389a86978d1800e6e23ffb9f1897..332c6b8b74302447a6f7cf23cd9515cebb064441 100644 (file)
--- a/linux/i386/syscallent.h
+++ b/linux/i386/syscallent.h
@@ -94,8 +94,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid16),                "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid16),                "setregid"              },
 [ 72] = { 3,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h
index 449919be26dff9fd9432ff26aa17b89b5071e63d..afda5e73c450a92bcd66b5e77f07af3c8ed246b3 100644 (file)
--- a/linux/m68k/syscallent.h
+++ b/linux/m68k/syscallent.h
@@ -94,8 +94,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid16),                "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid16),                "setregid"              },
 [ 72] = { 3,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h
index a0c609ec87d86e0a2a79841a599a2431968fbe99..3731acfc30fa0d207af39a21651f8b201dd7c8d1 100644 (file)
--- a/linux/microblaze/syscallent.h
+++ b/linux/microblaze/syscallent.h
@@ -94,8 +94,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid16),                "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid16),                "setregid"              },
 [ 72] = { 3,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/mips/syscallent-o32.h b/linux/mips/syscallent-o32.h
index c47525144a2f3ca4a9f8b4223bf48bcd65f77fb4..9b84c4835a713526059e630ab3be579f924b2d03 100644 (file)
--- a/linux/mips/syscallent-o32.h
+++ b/linux/mips/syscallent-o32.h
@@ -68,8 +68,8 @@
 [4065] = { 0,  0,              SEN(getpgrp),                   "getpgrp"               },
 [4066] = { 0,  0,              SEN(setsid),                    "setsid"                },
 [4067] = { 3,  TS,             SEN(sigaction),                 "sigaction"             },
-[4068] = { 0,  TS,             SEN(siggetmask),                "sgetmask"              },
-[4069] = { 1,  TS,             SEN(sigsetmask),                "ssetmask"              },
+[4068] = { 0,  TS,             SEN(sgetmask),                  "sgetmask"              },
+[4069] = { 1,  TS,             SEN(ssetmask),                  "ssetmask"              },
 [4070] = { 2,  0,              SEN(setreuid),                  "setreuid"              },
 [4071] = { 2,  0,              SEN(setregid),                  "setregid"              },
 [4072] = { 1,  TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h
index 69c2ac18e89ca5e0b12f1f7747ab700f3ca211ab..b3c4c2bc86d5fb28ef3a27e13983a887de7ba9f2 100644 (file)
--- a/linux/powerpc/syscallent.h
+++ b/linux/powerpc/syscallent.h
@@ -94,8 +94,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid),                  "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid),                  "setregid"              },
 [ 72] = { 1,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/powerpc64/syscallent.h b/linux/powerpc64/syscallent.h
index ce99ae6267e38175f20c4973c42aec128cd31435..3ce89c13f33d15a67fe7b928d7d376091eb17aeb 100644 (file)
--- a/linux/powerpc64/syscallent.h
+++ b/linux/powerpc64/syscallent.h
@@ -94,8 +94,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid),                  "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid),                  "setregid"              },
 [ 72] = { 1,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
index 072aea28d2fd6f2eb8efdc7d6d32801f1833ca39..f0a643b160c8953ce080b9c8631e3c6e38c7e47c 100644 (file)
--- a/linux/sh/syscallent.h
+++ b/linux/sh/syscallent.h
@@ -96,8 +96,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid16),                "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid16),                "setregid"              },
 [ 72] = { 1,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h
index 043c20e60635029e2ef2b3d42297365d77fd2cb8..5637fb42fce6eead2344ada855650eb3d3a593d1 100644 (file)
--- a/linux/sh64/syscallent.h
+++ b/linux/sh64/syscallent.h
@@ -94,8 +94,8 @@
 [ 65] = { 0,   0,              SEN(getpgrp),                   "getpgrp"               },
 [ 66] = { 0,   0,              SEN(setsid),                    "setsid"                },
 [ 67] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[ 68] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[ 69] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[ 68] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[ 69] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [ 70] = { 2,   0,              SEN(setreuid16),                "setreuid"              },
 [ 71] = { 2,   0,              SEN(setregid16),                "setregid"              },
 [ 72] = { 1,   TS,             SEN(sigsuspend),                "sigsuspend"            },

diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h
index c64b4461bbdba1b5100f72f75342237063b6fab6..3fb40ec751156d20683f26cb20271fcdc834adc5 100644 (file)
--- a/linux/sparc/syscallent.h
+++ b/linux/sparc/syscallent.h
@@ -197,8 +197,8 @@
 [196] = { 3,   0,              SEN(ioprio_set),                "ioprio_set"            },
 [197] = { 0,   NF,             SEN(getppid),                   "getppid"               },
 [198] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[199] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[200] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[199] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[200] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [201] = { 1,   TS,             SEN(sigsuspend),                "sigsuspend"            },
 [202] = { 2,   TF|TLST|TSTA,   SEN(lstat),                     "oldlstat"              },
 [203] = { 1,   TF,             SEN(uselib),                    "uselib"                },

diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h
index b0308a55c24a085dd573dcb5bc0c1ef2727124a8..9706425d209eabda471af59ddf9fd310d680f05a 100644 (file)
--- a/linux/sparc64/syscallent.h
+++ b/linux/sparc64/syscallent.h
@@ -195,8 +195,8 @@
 [196] = { 3,   0,              SEN(ioprio_set),                "ioprio_set"            },
 [197] = { 0,   NF,             SEN(getppid),                   "getppid"               },
 [198] = { 3,   TS,             SEN(sigaction),                 "sigaction"             },
-[199] = { 0,   TS,             SEN(siggetmask),                "sgetmask"              },
-[200] = { 1,   TS,             SEN(sigsetmask),                "ssetmask"              },
+[199] = { 0,   TS,             SEN(sgetmask),                  "sgetmask"              },
+[200] = { 1,   TS,             SEN(ssetmask),                  "ssetmask"              },
 [201] = { 1,   TS,             SEN(sigsuspend),                "sigsuspend"            },
 [202] = { 2,   TF|TLST|TSTA,   SEN(lstat),                     "oldlstat"              },
 [203] = { 1,   TF,             SEN(uselib),                    "uselib"                },

diff --git a/signal.c b/signal.c
index 321b507a4f06986356f9188fbe730f2a6ca0014c..88856b575902da23dd14b12e7e8f6cb8404b6bb0 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -285,7 +285,7 @@ print_sigset_addr(struct tcb *const tcp, const kernel_ulong_t addr)
        print_sigset_addr_len_limit(tcp, addr, NSIG_BYTES, NSIG_BYTES);
 }
 
-SYS_FUNC(sigsetmask)
+SYS_FUNC(ssetmask)
 {
        if (entering(tcp)) {
                tprintsigmask_val("", tcp->u_arg[0]);
@@ -393,7 +393,7 @@ SYS_FUNC(signal)
        return 0;
 }
 
-SYS_FUNC(siggetmask)
+SYS_FUNC(sgetmask)
 {
        if (exiting(tcp)) {
                tcp->auxstr = sprintsigmask_val("mask ", tcp->u_rval);