From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 12 Feb 2021 15:29:26 +0000 (+0100)
Subject: syscall-tables: add missing preposition and fix file name path
X-Git-Tag: v248-rc1~149^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b85ee926a8997cb85f0163c0b851fb05f8f5feca;p=thirdparty%2Fsystemd.git

syscall-tables: add missing preposition and fix file name path

I added an extension in 1f6f8cc8039a204609ddab79791ef22ee6340da0 but
forgot to fix the consumer script.
---

diff --git a/src/basic/missing_syscall_def.h b/src/basic/missing_syscall_def.h
index d87a6a7193b..44df37b37e8 100644
--- a/src/basic/missing_syscall_def.h
+++ b/src/basic/missing_syscall_def.h
@@ -42,7 +42,7 @@
 #    warning "bpf() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_bpf && __NR_bpf >= 0
 #    if defined systemd_NR_bpf
 assert_cc(__NR_bpf == systemd_NR_bpf);
@@ -98,7 +98,7 @@ assert_cc(__NR_bpf == systemd_NR_bpf);
 #    warning "close_range() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_close_range && __NR_close_range >= 0
 #    if defined systemd_NR_close_range
 assert_cc(__NR_close_range == systemd_NR_close_range);
@@ -154,7 +154,7 @@ assert_cc(__NR_close_range == systemd_NR_close_range);
 #    warning "copy_file_range() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_copy_file_range && __NR_copy_file_range >= 0
 #    if defined systemd_NR_copy_file_range
 assert_cc(__NR_copy_file_range == systemd_NR_copy_file_range);
@@ -210,7 +210,7 @@ assert_cc(__NR_copy_file_range == systemd_NR_copy_file_range);
 #    warning "getrandom() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_getrandom && __NR_getrandom >= 0
 #    if defined systemd_NR_getrandom
 assert_cc(__NR_getrandom == systemd_NR_getrandom);
@@ -266,7 +266,7 @@ assert_cc(__NR_getrandom == systemd_NR_getrandom);
 #    warning "memfd_create() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_memfd_create && __NR_memfd_create >= 0
 #    if defined systemd_NR_memfd_create
 assert_cc(__NR_memfd_create == systemd_NR_memfd_create);
@@ -322,7 +322,7 @@ assert_cc(__NR_memfd_create == systemd_NR_memfd_create);
 #    warning "name_to_handle_at() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_name_to_handle_at && __NR_name_to_handle_at >= 0
 #    if defined systemd_NR_name_to_handle_at
 assert_cc(__NR_name_to_handle_at == systemd_NR_name_to_handle_at);
@@ -378,7 +378,7 @@ assert_cc(__NR_name_to_handle_at == systemd_NR_name_to_handle_at);
 #    warning "pidfd_open() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_pidfd_open && __NR_pidfd_open >= 0
 #    if defined systemd_NR_pidfd_open
 assert_cc(__NR_pidfd_open == systemd_NR_pidfd_open);
@@ -434,7 +434,7 @@ assert_cc(__NR_pidfd_open == systemd_NR_pidfd_open);
 #    warning "pidfd_send_signal() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_pidfd_send_signal && __NR_pidfd_send_signal >= 0
 #    if defined systemd_NR_pidfd_send_signal
 assert_cc(__NR_pidfd_send_signal == systemd_NR_pidfd_send_signal);
@@ -490,7 +490,7 @@ assert_cc(__NR_pidfd_send_signal == systemd_NR_pidfd_send_signal);
 #    warning "pkey_mprotect() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_pkey_mprotect && __NR_pkey_mprotect >= 0
 #    if defined systemd_NR_pkey_mprotect
 assert_cc(__NR_pkey_mprotect == systemd_NR_pkey_mprotect);
@@ -546,7 +546,7 @@ assert_cc(__NR_pkey_mprotect == systemd_NR_pkey_mprotect);
 #    warning "renameat2() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_renameat2 && __NR_renameat2 >= 0
 #    if defined systemd_NR_renameat2
 assert_cc(__NR_renameat2 == systemd_NR_renameat2);
@@ -602,7 +602,7 @@ assert_cc(__NR_renameat2 == systemd_NR_renameat2);
 #    warning "setns() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_setns && __NR_setns >= 0
 #    if defined systemd_NR_setns
 assert_cc(__NR_setns == systemd_NR_setns);
@@ -658,7 +658,7 @@ assert_cc(__NR_setns == systemd_NR_setns);
 #    warning "statx() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_statx && __NR_statx >= 0
 #    if defined systemd_NR_statx
 assert_cc(__NR_statx == systemd_NR_statx);
diff --git a/src/basic/missing_syscalls.py b/src/basic/missing_syscalls.py
index d1991f0de30..746fbf4a260 100644
--- a/src/basic/missing_syscalls.py
+++ b/src/basic/missing_syscalls.py
@@ -33,7 +33,7 @@ def parse_syscall_table(filename):
             yield items[0], int(items[1])
 
 def parse_syscall_tables(filenames):
-    return {filename.split('-')[-1]: parse_syscall_table(filename)
+    return {filename.split('-')[-1][:-4]: parse_syscall_table(filename)
             for filename in filenames}
 
 DEF_TEMPLATE = '''\
@@ -78,7 +78,7 @@ DEF_TEMPLATE = '''\
 #    warning "{syscall}() syscall number is unknown for your architecture"
 #  endif
 
-/* may be (invalid) negative number due to libseccomp, see PR 13319 */
+/* may be an (invalid) negative number due to libseccomp, see PR 13319 */
 #  if defined __NR_{syscall} && __NR_{syscall} >= 0
 #    if defined systemd_NR_{syscall}
 assert_cc(__NR_{syscall} == systemd_NR_{syscall});