From d35bdcad13caac3e167735e1f0fc50355b2f9523 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Sat, 26 Apr 2014 18:10:19 +0000
Subject: [PATCH] Compress blank lines

Suppress empty lines left after automated xlat conversion.
---
 bjm.c      |  1 -
 desc.c     | 15 +--------------
 fanotify.c |  2 --
 file.c     |  1 -
 inotify.c  |  1 -
 ipc.c      |  7 -------
 kexec.c    |  1 -
 loop.c     |  1 -
 mem.c      |  5 -----
 mtd.c      |  5 -----
 net.c      |  1 -
 process.c  |  4 ----
 ptp.c      |  1 -
 quota.c    |  1 -
 reboot.c   |  2 --
 signal.c   |  8 --------
 system.c   | 10 ----------
 term.c     |  1 -
 time.c     |  9 ++-------
 19 files changed, 3 insertions(+), 73 deletions(-)

diff --git a/bjm.c b/bjm.c
index 1c0872ac..9e4d0fe3 100644
--- a/bjm.c
+++ b/bjm.c
@@ -70,7 +70,6 @@ struct module_info
 };
 
 #include "xlat/qm_which.h"
-
 #include "xlat/modflags.h"
 
 int
diff --git a/desc.c b/desc.c
index 9e39a92f..0c9a8175 100644
--- a/desc.c
+++ b/desc.c
@@ -39,21 +39,10 @@
 #endif
 
 #include "xlat/fcntlcmds.h"
-
 #include "xlat/fdflags.h"
-
-#ifdef LOCK_SH
-
 #include "xlat/flockcmds.h"
-
-#endif /* LOCK_SH */
-
 #include "xlat/lockfcmds.h"
-
-#ifdef F_NOTIFY
 #include "xlat/notifyflags.h"
-#endif
-
 #include "xlat/perf_event_open_flags.h"
 
 /*
@@ -465,8 +454,8 @@ sys_osf_select(struct tcb *tcp)
 #endif
 
 #include "xlat/epollctls.h"
-
 #include "xlat/epollevents.h"
+#include "xlat/epollflags.h"
 
 /* Not aliased to printargs_ld: we want it to have a distinct address */
 int
@@ -475,8 +464,6 @@ sys_epoll_create(struct tcb *tcp)
 	return printargs_ld(tcp);
 }
 
-#include "xlat/epollflags.h"
-
 int
 sys_epoll_create1(struct tcb *tcp)
 {
diff --git a/fanotify.c b/fanotify.c
index 6eeb9bc8..32a36675 100644
--- a/fanotify.c
+++ b/fanotify.c
@@ -2,7 +2,6 @@
 #include <linux/fanotify.h>
 
 #include "xlat/fan_classes.h"
-
 #include "xlat/fan_init_flags.h"
 
 int
@@ -27,7 +26,6 @@ sys_fanotify_init(struct tcb *tcp)
 }
 
 #include "xlat/fan_mark_flags.h"
-
 #include "xlat/fan_event_flags.h"
 
 int
diff --git a/file.c b/file.c
index 77f3f85a..c3222427 100644
--- a/file.c
+++ b/file.c
@@ -223,7 +223,6 @@ struct kernel_dirent {
 #endif
 
 #include "xlat/open_access_modes.h"
-
 #include "xlat/open_mode_flags.h"
 
 #ifndef AT_FDCWD
diff --git a/inotify.c b/inotify.c
index 0c451eae..32f6b311 100644
--- a/inotify.c
+++ b/inotify.c
@@ -3,7 +3,6 @@
 #include <linux/inotify.h>
 
 #include "xlat/inotify_flags.h"
-
 #include "xlat/inotify_init_flags.h"
 
 int
diff --git a/ipc.c b/ipc.c
index b863ecf7..e04a6189 100644
--- a/ipc.c
+++ b/ipc.c
@@ -64,19 +64,12 @@
 extern void printsigevent(struct tcb *tcp, long arg);
 
 #include "xlat/msgctl_flags.h"
-
 #include "xlat/semctl_flags.h"
-
 #include "xlat/shmctl_flags.h"
-
 #include "xlat/resource_flags.h"
-
 #include "xlat/shm_resource_flags.h"
-
 #include "xlat/shm_flags.h"
-
 #include "xlat/ipc_msg_flags.h"
-
 #include "xlat/semop_flags.h"
 
 int sys_msgget(struct tcb *tcp)
diff --git a/kexec.c b/kexec.c
index f96c2dd1..f95bea2d 100644
--- a/kexec.c
+++ b/kexec.c
@@ -2,7 +2,6 @@
 #include <linux/kexec.h>
 
 #include "xlat/kexec_arch_values.h"
-
 #include "xlat/kexec_flags.h"
 
 static void
diff --git a/loop.c b/loop.c
index 20145b0d..2e163479 100644
--- a/loop.c
+++ b/loop.c
@@ -32,7 +32,6 @@
 #include <linux/loop.h>
 
 #include "xlat/loop_flags_options.h"
-
 #include "xlat/loop_crypt_type_options.h"
 
 int loop_ioctl(struct tcb *tcp, long code, long arg)
diff --git a/mem.c b/mem.c
index 31e51f02..6ecd363c 100644
--- a/mem.c
+++ b/mem.c
@@ -54,7 +54,6 @@ sys_brk(struct tcb *tcp)
 }
 
 #include "xlat/mmap_prot.h"
-
 #include "xlat/mmap_flags.h"
 
 static int
@@ -268,7 +267,6 @@ sys_msync(struct tcb *tcp)
 #ifdef MC_SYNC
 
 #include "xlat/mctl_funcs.h"
-
 #include "xlat/mctl_lockas.h"
 
 int
@@ -374,11 +372,8 @@ sys_remap_file_pages(struct tcb *tcp)
 #define MPOL_MF_MOVE_ALL (1<<2)
 
 #include "xlat/policies.h"
-
 #include "xlat/mbindflags.h"
-
 #include "xlat/mempolicyflags.h"
-
 #include "xlat/move_pages_flags.h"
 
 static void
diff --git a/mtd.c b/mtd.c
index 5d3f7791..8ba658b5 100644
--- a/mtd.c
+++ b/mtd.c
@@ -42,13 +42,9 @@
 #endif
 
 #include "xlat/mtd_mode_options.h"
-
 #include "xlat/mtd_type_options.h"
-
 #include "xlat/mtd_flags_options.h"
-
 #include "xlat/mtd_otp_options.h"
-
 #include "xlat/mtd_nandecc_options.h"
 
 int mtd_ioctl(struct tcb *tcp, long code, long arg)
@@ -254,7 +250,6 @@ int mtd_ioctl(struct tcb *tcp, long code, long arg)
 }
 
 #include "xlat/ubi_volume_types.h"
-
 #include "xlat/ubi_volume_props.h"
 
 int ubi_ioctl(struct tcb *tcp, long code, long arg)
diff --git a/net.c b/net.c
index ab33ab4e..08341adc 100644
--- a/net.c
+++ b/net.c
@@ -111,7 +111,6 @@
 #endif
 
 #include "xlat/msg_flags.h"
-
 #include "xlat/sockoptions.h"
 
 #if !defined(SOL_IP) && defined(IPPROTO_IP)
diff --git a/process.c b/process.c
index 59424a84..a880f9e3 100644
--- a/process.c
+++ b/process.c
@@ -995,11 +995,7 @@ sys_uname(struct tcb *tcp)
 }
 
 #include "xlat/ptrace_cmds.h"
-
-#ifdef PTRACE_SETOPTIONS
 #include "xlat/ptrace_setoptions_flags.h"
-#endif /* PTRACE_SETOPTIONS */
-
 #include "xlat/nt_descriptor_types.h"
 
 #define uoff(member)	offsetof(struct user, member)
diff --git a/ptp.c b/ptp.c
index 64e9905e..1d9cf247 100644
--- a/ptp.c
+++ b/ptp.c
@@ -4,7 +4,6 @@
 
 #include "xlat/ptp_flags_options.h"
 
-
 int ptp_ioctl(struct tcb *tcp, long code, long arg)
 {
 	if (!verbose(tcp))
diff --git a/quota.c b/quota.c
index 7f2a3a6c..f9a1bc57 100644
--- a/quota.c
+++ b/quota.c
@@ -99,7 +99,6 @@
 #define XFS_GROUP_QUOTA		(1<<2)	/* group quota type */
 
 #include "xlat/xfs_quota_flags.h"
-
 #include "xlat/xfs_dqblk_flags.h"
 
 /*
diff --git a/reboot.c b/reboot.c
index ab1160ba..397a1269 100644
--- a/reboot.c
+++ b/reboot.c
@@ -2,9 +2,7 @@
 #include <linux/reboot.h>
 
 #include "xlat/bootflags1.h"
-
 #include "xlat/bootflags2.h"
-
 #include "xlat/bootflags3.h"
 
 int
diff --git a/signal.c b/signal.c
index b11dc6a5..f013e0a3 100644
--- a/signal.c
+++ b/signal.c
@@ -101,7 +101,6 @@ struct sigcontext {
 #endif
 
 #include "xlat/sigact_flags.h"
-
 #include "xlat/sigprocmaskcmds.h"
 
 #endif /* HAVE_SIGACTION */
@@ -328,17 +327,11 @@ print_sigset_addr_len(struct tcb *tcp, long addr, long len)
 #endif
 
 #include "xlat/siginfo_codes.h"
-
 #include "xlat/sigill_codes.h"
-
 #include "xlat/sigfpe_codes.h"
-
 #include "xlat/sigtrap_codes.h"
-
 #include "xlat/sigchld_codes.h"
-
 #include "xlat/sigpoll_codes.h"
-
 #include "xlat/sigprof_codes.h"
 
 #ifdef SIGEMT
@@ -346,7 +339,6 @@ print_sigset_addr_len(struct tcb *tcp, long addr, long len)
 #endif
 
 #include "xlat/sigsegv_codes.h"
-
 #include "xlat/sigbus_codes.h"
 
 #ifndef SYS_SECCOMP
diff --git a/system.c b/system.c
index 20a9de21..afffa0c8 100644
--- a/system.c
+++ b/system.c
@@ -414,25 +414,15 @@ int sys_capset(struct tcb *tcp)
 # define CTL_PROC 4
 # define CTL_CPU 10		/* older headers lack */
 #include "xlat/sysctl_root.h"
-
 #include "xlat/sysctl_kern.h"
-
 #include "xlat/sysctl_vm.h"
-
 #include "xlat/sysctl_net.h"
-
 #include "xlat/sysctl_net_core.h"
-
 #include "xlat/sysctl_net_unix.h"
-
 #include "xlat/sysctl_net_ipv4.h"
-
 #include "xlat/sysctl_net_ipv4_route.h"
-
 #include "xlat/sysctl_net_ipv4_conf.h"
-
 #include "xlat/sysctl_net_ipv6.h"
-
 #include "xlat/sysctl_net_ipv6_route.h"
 
 int
diff --git a/term.c b/term.c
index d8f793b3..d1c9b653 100644
--- a/term.c
+++ b/term.c
@@ -42,7 +42,6 @@
 #endif
 
 #include "xlat/baud_options.h"
-
 #include "xlat/modem_flags.h"
 
 int term_ioctl(struct tcb *tcp, long code, long arg)
diff --git a/time.c b/time.c
index f4383c47..1ad90d9a 100644
--- a/time.c
+++ b/time.c
@@ -398,9 +398,7 @@ sys_osf_setitimer(struct tcb *tcp)
 #endif
 
 #include "xlat/adjtimex_modes.h"
-
 #include "xlat/adjtimex_status.h"
-
 #include "xlat/adjtimex_state.h"
 
 #if SUPPORTED_PERSONALITIES > 1
@@ -522,17 +520,14 @@ sys_adjtimex(struct tcb *tcp)
 }
 
 #include "xlat/clockflags.h"
-
 #include "xlat/clocknames.h"
 
-#ifdef CLOCKID_TO_FD
-#include "xlat/cpuclocknames.h"
-#endif
-
 static void
 printclockname(int clockid)
 {
 #ifdef CLOCKID_TO_FD
+# include "xlat/cpuclocknames.h"
+
 	if (clockid < 0) {
 		if ((clockid & CLOCKFD_MASK) == CLOCKFD)
 			tprintf("FD_TO_CLOCKID(%d)", CLOCKID_TO_FD(clockid));