Eliminate excess whitespace.

7 files changed, 76 insertions, 76 deletions

diff --git a/winsup/cygwin/include/cygwin/if.h b/winsup/cygwin/include/cygwin/if.h
index a743ed5ce..b0953de36 100644
--- a/winsup/cygwin/include/cygwin/if.h
+++ b/winsup/cygwin/include/cygwin/if.h
@@ -38,20 +38,20 @@ struct ifreq
 {
 #define IFNAMSIZ        16
 #define IFHWADDRLEN     6
-        union
-        {
-                char    ifrn_name[IFNAMSIZ];            /* if name, e.g. "en0" */
-        } ifr_ifrn;
-
-        union {
-                struct  sockaddr ifru_addr;
-                struct  sockaddr ifru_broadaddr;
-                struct  sockaddr ifru_netmask;
-                struct  sockaddr ifru_hwaddr;
-                short   ifru_flags;
-                int     ifru_metric;
-                int     ifru_mtu;
-        } ifr_ifru;
+	union
+	{
+		char    ifrn_name[IFNAMSIZ];            /* if name, e.g. "en0" */
+	} ifr_ifrn;
+
+	union {
+		struct  sockaddr ifru_addr;
+		struct  sockaddr ifru_broadaddr;
+		struct  sockaddr ifru_netmask;
+		struct  sockaddr ifru_hwaddr;
+		short   ifru_flags;
+		int     ifru_metric;
+		int     ifru_mtu;
+	} ifr_ifru;
 };
 
 #define ifr_name        ifr_ifrn.ifrn_name      /* interface name       */
@@ -73,12 +73,12 @@ struct ifreq
 
 struct ifconf
 {
-        int     ifc_len;                        /* size of buffer       */
-        union
-        {
-                caddr_t ifcu_buf;
-                struct  ifreq *ifcu_req;
-        } ifc_ifcu;
+	int     ifc_len;                        /* size of buffer       */
+	union
+	{
+		caddr_t ifcu_buf;
+		struct  ifreq *ifcu_req;
+	} ifc_ifcu;
 };
 #define ifc_buf ifc_ifcu.ifcu_buf               /* buffer address       */
 #define ifc_req ifc_ifcu.ifcu_req               /* array of structures  */
diff --git a/winsup/cygwin/include/cygwin/types.h b/winsup/cygwin/include/cygwin/types.h
index 7114b7c4a..c17eca4c6 100644
--- a/winsup/cygwin/include/cygwin/types.h
+++ b/winsup/cygwin/include/cygwin/types.h
@@ -1,6 +1,6 @@
 /* types.h
 
-   Copyright 2001 Red Hat Inc. 
+   Copyright 2001 Red Hat Inc.
    Written by Robert Collins <rbtcollins@hotmail.com>
 
 This file is part of Cygwin.
diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include/cygwin/version.h
index 77cf667da..98f559662 100644
--- a/winsup/cygwin/include/cygwin/version.h
+++ b/winsup/cygwin/include/cygwin/version.h
@@ -93,12 +93,12 @@ details. */
      /* API_MAJOR 0.0: Initial version.  API_MINOR changes:
 	1: Export cygwin32_ calls as cygwin_ as well.
 	2: Export j1, jn, y1, yn.
-        3: Export dll_noncygwin_dllcrt0.
-        4: New socket ioctls, revamped ifconf support.
-        5: Thread support/exports.
-        6: Change in termios handling.
-        7: Export scandir and alphasort.
-        8: Export _ctype_, _sys_errlist, _sys_nerr.
+	3: Export dll_noncygwin_dllcrt0.
+	4: New socket ioctls, revamped ifconf support.
+	5: Thread support/exports.
+	6: Change in termios handling.
+	7: Export scandir and alphasort.
+	8: Export _ctype_, _sys_errlist, _sys_nerr.
 	9: Mount-related changes, new cygwin_umount export.
 	   Raw device support (tape, floppies).
        10: Fast math routine support added.
@@ -114,10 +114,10 @@ details. */
        20: regsub, inet_network
        21: incompatible change to stdio cr/lf and buffering
        22: Export cygwin_logon_user, cygwin_set_impersonation_token.
-           geteuid, getegid return effective uid/gid.
-           getuid, getgid return real uid/gid.
-           seteuid, setegid set only effective uid/gid.
-           setuid, setgid set effective and real uid/gid.
+	   geteuid, getegid return effective uid/gid.
+	   getuid, getgid return real uid/gid.
+	   seteuid, setegid set only effective uid/gid.
+	   setuid, setgid set effective and real uid/gid.
        23: Export new dll_crt0 interface and cygwin_user_data for use
 	   with crt0 startup code.
        24: Export poll and _poll.
@@ -132,7 +132,7 @@ details. */
        33: Export setlogmask
        34: Separated out mount table
        35: Export drand48, erand48, jrand48, lcong48, lrand48,
-           mrand48, nrand48, seed48, and srand48.
+	   mrand48, nrand48, seed48, and srand48.
        36: Added _cygwin_S_IEXEC, et al
        37: [f]pathconv support _PC_POSIX_PERMISSIONS and _PC_POSIX_SECURITY
        38: vscanf, vscanf_r, and random pthread functions
diff --git a/winsup/cygwin/include/pthread.h b/winsup/cygwin/include/pthread.h
index 486635da7..3c51cf12a 100644
--- a/winsup/cygwin/include/pthread.h
+++ b/winsup/cygwin/include/pthread.h
@@ -83,7 +83,7 @@ int pthread_attr_setscope (pthread_attr_t *, int);
 
 #ifdef _POSIX_THREAD_ATTR_STACKADDR
 /* These functions may be implementable via some low level trickery. For now they are
- * Not supported or implemented. The prototypes are here so if someone greps the 
+ * Not supported or implemented. The prototypes are here so if someone greps the
  * source they will see these comments
  */
 int pthread_attr_getstackaddr (const pthread_attr_t *, void **);
@@ -96,7 +96,7 @@ int pthread_attr_setstacksize (pthread_attr_t *, size_t);
 #endif
 
 int pthread_cancel (pthread_t);
-/* Macros for cleanup_push and pop; 
+/* Macros for cleanup_push and pop;
  * The function definitions are
 void pthread_cleanup_push (void (*routine)(void*), void *arg);
 void pthread_cleanup_pop (int execute);
diff --git a/winsup/cygwin/include/sys/resource.h b/winsup/cygwin/include/sys/resource.h
index c68a206e1..c1fe544a9 100644
--- a/winsup/cygwin/include/sys/resource.h
+++ b/winsup/cygwin/include/sys/resource.h
@@ -50,16 +50,16 @@ struct rusage {
 	long ru_ixrss;               /* XXX: 0 */
 	long ru_idrss;               /* XXX: sum of rm_asrss */
 	long ru_isrss;               /* XXX: 0 */
-        long ru_minflt;              /* any page faults not requiring I/O */
-        long ru_majflt;              /* any page faults requiring I/O */
-        long ru_nswap;               /* swaps */
-        long ru_inblock;             /* block input operations */
-        long ru_oublock;             /* block output operations */
-        long ru_msgsnd;              /* messages sent */
-        long ru_msgrcv;              /* messages received */
-        long ru_nsignals;            /* signals received */
-        long ru_nvcsw;               /* voluntary context switches */
-        long ru_nivcsw;              /* involuntary " */
+	long ru_minflt;              /* any page faults not requiring I/O */
+	long ru_majflt;              /* any page faults requiring I/O */
+	long ru_nswap;               /* swaps */
+	long ru_inblock;             /* block input operations */
+	long ru_oublock;             /* block output operations */
+	long ru_msgsnd;              /* messages sent */
+	long ru_msgrcv;              /* messages received */
+	long ru_nsignals;            /* signals received */
+	long ru_nvcsw;               /* voluntary context switches */
+	long ru_nivcsw;              /* involuntary " */
 #define ru_last         ru_nivcsw
 };
 
diff --git a/winsup/cygwin/include/sys/soundcard.h b/winsup/cygwin/include/sys/soundcard.h
index 1a40bff61..05b06098a 100644
--- a/winsup/cygwin/include/sys/soundcard.h
+++ b/winsup/cygwin/include/sys/soundcard.h
@@ -53,10 +53,10 @@
 #define SNDCARD_UART6850	8
 #define SNDCARD_GUS16		9
 #define SNDCARD_MSS		10
-#define SNDCARD_PSS     	11
+#define SNDCARD_PSS		11
 #define SNDCARD_SSCAPE		12
-#define SNDCARD_PSS_MPU     	13
-#define SNDCARD_PSS_MSS     	14
+#define SNDCARD_PSS_MPU		13
+#define SNDCARD_PSS_MSS		14
 #define SNDCARD_SSCAPE_MSS	15
 #define SNDCARD_TRXPRO		16
 #define SNDCARD_TRXPRO_SB	17
@@ -194,7 +194,7 @@ typedef struct seq_event_rec {
  *	Gravis UltraSound. It tries to be universal format for uploading
  *	sample based patches but is probably too limited.
  *
- *      (PBD) As Hannu guessed, the GUS structure is too limited for 
+ *      (PBD) As Hannu guessed, the GUS structure is too limited for
  *      the WaveFront, but this is the right place for a constant definition.
  */
 
@@ -220,7 +220,7 @@ struct patch_info {
 #define WAVE_SUSTAIN_ON	0x20	/* bit 5 = Turn sustaining on. (Env. pts. 3)*/
 #define WAVE_ENVELOPES	0x40	/* bit 6 = Enable envelopes - 1 */
 #define WAVE_FAST_RELEASE 0x80	/* bit 7 = Shut off immediately after note off */
-				/* 	(use the env_rate/env_offs fields). */
+				/*	(use the env_rate/env_offs fields). */
 /* Linux specific bits */
 #define WAVE_VIBRATO	0x00010000	/* The vibrato info is valid */
 #define WAVE_TREMOLO	0x00020000	/* The tremolo info is valid */
@@ -234,7 +234,7 @@ struct patch_info {
 		int len;	/* Size of the wave data in bytes */
 		int loop_start, loop_end; /* Byte offsets from the beginning */
 
-/* 
+/*
  * The base_freq and base_note fields are used when computing the
  * playback speed for a note. The base_note defines the tone frequency
  * which is heard if the sample is played using the base_freq as the
@@ -263,7 +263,7 @@ struct patch_info {
 		unsigned char	env_rate[ 6 ];	 /* GUS HW ramping rate */
 		unsigned char	env_offset[ 6 ]; /* 255 == 100% */
 
-	/* 
+	/*
 	 * The tremolo, vibrato and scale info are not supported yet.
 	 * Enable by setting the mode bits WAVE_TREMOLO, WAVE_VIBRATO or
 	 * WAVE_SCALE
@@ -280,10 +280,10 @@ struct patch_info {
 		int		scale_frequency;
 		unsigned int	scale_factor;		/* from 0 to 2048 or 0 to 2 */
 	
-	        int		volume;
+		int		volume;
 		int		fractions;
 		int		reserved1;
-	        int		spare[2];
+		int		spare[2];
 		char data[1];	/* The waveform data starts here */
 	};
 
@@ -300,7 +300,7 @@ struct sysex_info {
  * /dev/sequencer input events.
  *
  * The data written to the /dev/sequencer is a stream of events. Events
- * are records of 4 or 8 bytes. The first byte defines the size. 
+ * are records of 4 or 8 bytes. The first byte defines the size.
  * Any number of events can be written with a write call. There
  * is a set of macros for sending these events. Use these macros if you
  * want to maximize portability of your program.
@@ -433,13 +433,13 @@ struct sysex_info {
  *	of the associated synthesizer device. There is no limit to the size
  *	of the extended events. These events are not queued but executed
  *	immediately when the write() is called (execution can take several
- *	seconds of time). 
+ *	seconds of time).
  *
  *	When a SEQ_FULLSIZE message is written to the device, it must
  *	be written using exactly one write() call. Other events cannot
  *	be mixed to the same write.
  *	
- *	For FM synths (YM3812/OPL3) use struct sbi_instrument and write it to the 
+ *	For FM synths (YM3812/OPL3) use struct sbi_instrument and write it to the
  *	/dev/sequencer. Don't write other data together with the instrument structure
  *	Set the key field of the structure to FM_PATCH. The device field is used to
  *	route the patch to the corresponding device.
@@ -461,7 +461,7 @@ struct sbi_instrument {
 #define FM_PATCH	_PATCHKEY(0x01)
 #define OPL3_PATCH	_PATCHKEY(0x03)
 		short		device;		/*	Synth# (0-4)	*/
-		int 		channel;	/*	Program# to be initialized 	*/
+		int		channel;	/*	Program# to be initialized	*/
 		sbi_instr_data	operators;	/*	Register settings for operator cells (.SBI format)	*/
 	};
 
@@ -625,7 +625,7 @@ typedef struct buffmem_desc {
 
 /*
  * Application's profile defines the way how playback underrun situations should be handled.
- * 
+ *
  *	APF_NORMAL (the default) and APF_NETWORK make the driver to cleanup the
  *	playback buffer whenever an underrun occurs. This consumes some time
  *	prevents looping the existing buffer.
@@ -711,11 +711,11 @@ typedef struct copr_msg {
  * IOCTL commands for /dev/mixer
  */
 	
-/* 
+/*
  * Mixer devices
  *
  * There can be up to 20 different analog mixer channels. The
- * SOUND_MIXER_NRDEVICES gives the currently supported maximum. 
+ * SOUND_MIXER_NRDEVICES gives the currently supported maximum.
  * The SOUND_MIXER_READ_DEVMASK returns a bitmask which tells
  * the devices supported by the particular mixer.
  */
@@ -735,7 +735,7 @@ typedef struct copr_msg {
 #define SOUND_MIXER_RECLEV	11	/* Recording level */
 #define SOUND_MIXER_IGAIN	12	/* Input gain */
 #define SOUND_MIXER_OGAIN	13	/* Output gain */
-/* 
+/*
  * The AD1848 codec and compatibles have three line level inputs
  * (line, aux1 and aux2). Since each card manufacturer have assigned
  * different meanings to these inputs, it's inpractical to assign
@@ -940,7 +940,7 @@ typedef struct mixer_vol_table {
 #define SOUND_MIXER_GETLEVELS		_SIOWR('M', 116, mixer_vol_table)
 #define SOUND_MIXER_SETLEVELS		_SIOWR('M', 117, mixer_vol_table)
 
-/* 
+/*
  * An ioctl for identifying the driver version. It will return value
  * of the SOUND_VERSION macro used when compiling the driver.
  * This call was introduced in OSS version 3.6 and it will not work
@@ -954,7 +954,7 @@ typedef struct mixer_vol_table {
 
 /*
  * The 4 most significant bits of byte 0 specify the class of
- * the event: 
+ * the event:
  *
  *	0x8X = system level events,
  *	0x9X = device/port specific events, event[1] = device/port,
@@ -1014,7 +1014,7 @@ typedef struct mixer_vol_table {
  */
 #define LOCL_STARTAUDIO		1
 
-#if (!defined(__KERNEL__) && !defined(KERNEL) && !defined(INKERNEL) && !defined(_KERNEL)) || defined(USE_SEQ_MACROS) 
+#if (!defined(__KERNEL__) && !defined(KERNEL) && !defined(INKERNEL) && !defined(_KERNEL)) || defined(USE_SEQ_MACROS)
 /*
  *	Some convenience macros to simplify programming of the
  *	/dev/sequencer interface
@@ -1087,16 +1087,16 @@ extern int OSS_write_patch2(int fd, unsigned char *buf, int len);
 /*
  * This variation of the sequencer macros is used just to format one event
  * using fixed buffer.
- * 
+ *
  * The program using the macro library must define the following macros before
  * using this library.
  *
- * #define _seqbuf 		 name of the buffer (unsigned char[]) 
+ * #define _seqbuf		 name of the buffer (unsigned char[])
  * #define _SEQ_ADVBUF(len)	 If the applic needs to know the exact
  *				 size of the event, this macro can be used.
  *				 Otherwise this must be defined as empty.
  * #define _seqbufptr		 Define the name of index variable or 0 if
- *				 not required. 
+ *				 not required.
  */
 #define _SEQ_NEEDBUF(len)	/* empty */
 #endif
@@ -1157,7 +1157,7 @@ extern int OSS_write_patch2(int fd, unsigned char *buf, int len);
  * sending any MIDI bytes but it's absolutely not possible. Trying to do
  * so _will_ cause problems with MPU401 intelligent mode).
  *
- * Sysex messages are sent in blocks of 1 to 6 bytes. Longer messages must be 
+ * Sysex messages are sent in blocks of 1 to 6 bytes. Longer messages must be
  * sent by calling SEQ_SYSEX() several times (there must be no other events
  * between them). First sysex fragment must have 0xf0 in the first byte
  * and the last byte (buf[len-1] of the last fragment must be 0xf7. No byte
@@ -1225,11 +1225,11 @@ extern int OSS_write_patch2(int fd, unsigned char *buf, int len);
  */
 
 #define _TIMER_EVENT(ev, parm)		{_SEQ_NEEDBUF(8);\
-				 	_seqbuf[_seqbufptr+0] = EV_TIMING; \
-				 	_seqbuf[_seqbufptr+1] = (ev); \
+					_seqbuf[_seqbufptr+0] = EV_TIMING; \
+					_seqbuf[_seqbufptr+1] = (ev); \
 					_seqbuf[_seqbufptr+2] = 0;\
 					_seqbuf[_seqbufptr+3] = 0;\
-				 	*(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
+					*(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
 					_SEQ_ADVBUF(8);}
 
 #define SEQ_START_TIMER()		_TIMER_EVENT(TMR_START, 0)
@@ -1247,16 +1247,16 @@ extern int OSS_write_patch2(int fd, unsigned char *buf, int len);
  */
 
 #define _LOCAL_EVENT(ev, parm)		{_SEQ_NEEDBUF(8);\
-				 	_seqbuf[_seqbufptr+0] = EV_SEQ_LOCAL; \
-				 	_seqbuf[_seqbufptr+1] = (ev); \
+					_seqbuf[_seqbufptr+0] = EV_SEQ_LOCAL; \
+					_seqbuf[_seqbufptr+1] = (ev); \
 					_seqbuf[_seqbufptr+2] = 0;\
 					_seqbuf[_seqbufptr+3] = 0;\
-				 	*(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
+					*(unsigned int *)&_seqbuf[_seqbufptr+4] = (parm); \
 					_SEQ_ADVBUF(8);}
 
 #define SEQ_PLAYAUDIO(devmask)		_LOCAL_EVENT(LOCL_STARTAUDIO, devmask)
 /*
- * Events for the level 1 interface only 
+ * Events for the level 1 interface only
  */
 
 #define SEQ_MIDIOUT(device, byte)	{_SEQ_NEEDBUF(4);\
diff --git a/winsup/cygwin/include/sys/un.h b/winsup/cygwin/include/sys/un.h
index 25588e2b2..4e3eee82b 100644
--- a/winsup/cygwin/include/sys/un.h
+++ b/winsup/cygwin/include/sys/un.h
@@ -21,6 +21,6 @@ struct sockaddr_un {
 
 /* Evaluates the actual length of `sockaddr_un' structure. */
 #define SUN_LEN(p) ((size_t)(((struct sockaddr_un *) NULL)->sun_path) \
-                   + strlen ((p)->sun_path))
+		   + strlen ((p)->sun_path))
 
 #endif