From: Dmitry V. Levin <ldv@altlinux.org>
Date: Fri, 27 May 2016 00:39:33 +0000 (+0000)
Subject: evdev.c: fix indentation of preprocessor directives
X-Git-Tag: v4.12~33
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8d85c233d27791b453e55d09603540f8129c48d9;p=strace

evdev.c: fix indentation of preprocessor directives

* evdev.c: Fix indentation of preprocessor directives.
Move inclusion of <linux/ioctl.h> into [HAVE_LINUX_INPUT_H].
---

diff --git a/evdev.c b/evdev.c
index f89397e6..1bd9c88b 100644
--- a/evdev.c
+++ b/evdev.c
@@ -28,27 +28,27 @@
 
 #include "defs.h"
 
-#include <linux/ioctl.h>
-
 #ifdef HAVE_LINUX_INPUT_H
-#include <linux/input.h>
-#include "xlat/evdev_abs.h"
-#include "xlat/evdev_autorepeat.h"
-#include "xlat/evdev_ff_status.h"
-#include "xlat/evdev_ff_types.h"
-#include "xlat/evdev_keycode.h"
-#include "xlat/evdev_leds.h"
-#include "xlat/evdev_misc.h"
-#include "xlat/evdev_mtslots.h"
-#include "xlat/evdev_prop.h"
-#include "xlat/evdev_relative_axes.h"
-#include "xlat/evdev_snd.h"
-#include "xlat/evdev_switch.h"
-#include "xlat/evdev_sync.h"
-
-#ifndef SYN_MAX
-# define SYN_MAX 0xf
-#endif
+
+# include <linux/ioctl.h>
+# include <linux/input.h>
+# include "xlat/evdev_abs.h"
+# include "xlat/evdev_autorepeat.h"
+# include "xlat/evdev_ff_status.h"
+# include "xlat/evdev_ff_types.h"
+# include "xlat/evdev_keycode.h"
+# include "xlat/evdev_leds.h"
+# include "xlat/evdev_misc.h"
+# include "xlat/evdev_mtslots.h"
+# include "xlat/evdev_prop.h"
+# include "xlat/evdev_relative_axes.h"
+# include "xlat/evdev_snd.h"
+# include "xlat/evdev_switch.h"
+# include "xlat/evdev_sync.h"
+
+# ifndef SYN_MAX
+#  define SYN_MAX 0xf
+# endif
 
 static void
 decode_envelope(struct ff_envelope *envelope)
@@ -146,9 +146,9 @@ abs_ioctl(struct tcb *tcp, long arg)
 		tprintf(", maximum=%" PRIu32 ", fuzz=%" PRIu32,
 			absinfo.maximum, absinfo.fuzz);
 		tprintf(", flat=%" PRIu32, absinfo.flat);
-#ifdef HAVE_STRUCT_INPUT_ABSINFO_RESOLUTION
+# ifdef HAVE_STRUCT_INPUT_ABSINFO_RESOLUTION
 		tprintf(", resolution=%" PRIu32, absinfo.resolution);
-#endif
+# endif
 		tprints("}");
 	} else {
 		tprints(", ...}");
@@ -175,7 +175,7 @@ keycode_ioctl(struct tcb *tcp, long arg)
 	return 1;
 }
 
-#ifdef EVIOCGKEYCODE_V2
+# ifdef EVIOCGKEYCODE_V2
 static int
 keycode_V2_ioctl(struct tcb *tcp, long arg)
 {
@@ -207,7 +207,7 @@ keycode_V2_ioctl(struct tcb *tcp, long arg)
 	}
 	return 1;
 }
-#endif /* EVIOCGKEYCODE_V2 */
+# endif /* EVIOCGKEYCODE_V2 */
 
 static int
 getid_ioctl(struct tcb *tcp, long arg)
@@ -270,7 +270,7 @@ decode_bitset(struct tcb *tcp, long arg, const struct xlat decode_nr[],
 	return 1;
 }
 
-#ifdef EVIOCGMTSLOTS
+# ifdef EVIOCGMTSLOTS
 static int
 mtslots_ioctl(struct tcb *tcp, const unsigned int code, long arg)
 {
@@ -295,9 +295,9 @@ mtslots_ioctl(struct tcb *tcp, const unsigned int code, long arg)
 	tprints("]}");
 	return 1;
 }
-#endif /* EVIOCGMTSLOTS */
+# endif /* EVIOCGMTSLOTS */
 
-#if defined EVIOCGREP || defined EVIOCSREP
+# if defined EVIOCGREP || defined EVIOCSREP
 static int
 repeat_ioctl(struct tcb *tcp, long arg)
 {
@@ -305,7 +305,7 @@ repeat_ioctl(struct tcb *tcp, long arg)
 	printpair_int(tcp, arg, "%u");
 	return 1;
 }
-#endif /* EVIOCGREP || EVIOCSREP */
+# endif /* EVIOCGREP || EVIOCSREP */
 
 static int
 evdev_read_ioctl(struct tcb *tcp, const unsigned int code, long arg)
@@ -333,11 +333,11 @@ evdev_read_ioctl(struct tcb *tcp, const unsigned int code, long arg)
 			case EV_MSC:
 				return decode_bitset(tcp, arg,
 						evdev_misc, MSC_MAX, "MSC_???");
-#ifdef EV_SW
+# ifdef EV_SW
 			case EV_SW:
 				return decode_bitset(tcp, arg,
 						evdev_switch, SW_MAX, "SW_???");
-#endif
+# endif
 			case EV_LED:
 				return decode_bitset(tcp, arg,
 						evdev_leds, LED_MAX, "LED_???");
@@ -375,42 +375,42 @@ evdev_read_ioctl(struct tcb *tcp, const unsigned int code, long arg)
 			return 1;
 		case EVIOCGID:
 			return getid_ioctl(tcp, arg);
-#ifdef EVIOCGREP
+# ifdef EVIOCGREP
 		case EVIOCGREP:
 			return repeat_ioctl(tcp, arg);;
-#endif
+# endif
 		case EVIOCGKEYCODE:
 			return keycode_ioctl(tcp, arg);
-#ifdef EVIOCGKEYCODE_V2
+# ifdef EVIOCGKEYCODE_V2
 		case EVIOCGKEYCODE_V2:
 			return keycode_V2_ioctl(tcp, arg);
-#endif
+# endif
 	}
 
 	switch (_IOC_NR(code)) {
-#ifdef EVIOCGMTSLOTS
+# ifdef EVIOCGMTSLOTS
 		case _IOC_NR(EVIOCGMTSLOTS(0)):
 			return mtslots_ioctl(tcp, code, arg);
-#endif
+# endif
 		case _IOC_NR(EVIOCGNAME(0)):
 		case _IOC_NR(EVIOCGPHYS(0)):
 		case _IOC_NR(EVIOCGUNIQ(0)):
 			tprints(", ");
 			printstr(tcp, arg, tcp->u_rval - 1);
 			return 1;
-#ifdef EVIOCGPROP
+# ifdef EVIOCGPROP
 		case _IOC_NR(EVIOCGPROP(0)):
 			return decode_bitset(tcp, arg,
 					evdev_prop, INPUT_PROP_MAX, "PROP_???");
-#endif
+# endif
 		case _IOC_NR(EVIOCGSND(0)):
 			return decode_bitset(tcp, arg,
 					evdev_snd, SND_MAX, "SND_???");
-#ifdef EVIOCGSW
+# ifdef EVIOCGSW
 		case _IOC_NR(EVIOCGSW(0)):
 			return decode_bitset(tcp, arg,
 					evdev_switch, SW_MAX, "SW_???");
-#endif
+# endif
 		case _IOC_NR(EVIOCGKEY(0)):
 			return decode_bitset(tcp, arg,
 					evdev_keycode, KEY_MAX, "KEY_???");
@@ -432,26 +432,26 @@ evdev_write_ioctl(struct tcb *tcp, const unsigned int code, long arg)
 		return abs_ioctl(tcp, arg);
 
 	switch (code) {
-#ifdef EVIOCSREP
+# ifdef EVIOCSREP
 		case EVIOCSREP:
 			return repeat_ioctl(tcp, arg);
-#endif
+# endif
 		case EVIOCSKEYCODE:
 			return keycode_ioctl(tcp, arg);
-#ifdef EVIOCSKEYCODE_V2
+# ifdef EVIOCSKEYCODE_V2
 		case EVIOCSKEYCODE_V2:
 			return keycode_V2_ioctl(tcp, arg);
-#endif
+# endif
 		case EVIOCSFF:
 			return ff_effect_ioctl(tcp, arg);
 		case EVIOCRMFF:
-#ifdef EVIOCSCLOCKID
+# ifdef EVIOCSCLOCKID
 		case EVIOCSCLOCKID:
-#endif
+# endif
 		case EVIOCGRAB:
-#ifdef EVIOCREVOKE
+# ifdef EVIOCREVOKE
 		case EVIOCREVOKE:
-#endif
+# endif
 			tprints(", ");
 			printnum_int(tcp, arg, "%u");
 			return 1;