[#189] Whitespace fixes in opened files

14 files changed, 73 insertions, 79 deletions

diff --git a/includes/arpa/nameser.h b/includes/arpa/nameser.h
index 69ed5c92..54ddb5dc 100644
--- a/includes/arpa/nameser.h
+++ b/includes/arpa/nameser.h
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 1983, 1989, 1993
  *    The Regents of the University of California.  All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -13,7 +13,7 @@
  * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
diff --git a/includes/cdefs.h b/includes/cdefs.h
index 59f16a5a..1a96b2ea 100644
--- a/includes/cdefs.h
+++ b/includes/cdefs.h
@@ -61,7 +61,7 @@
 #endif
 
 /* This macro is defined to avoid unused-but-set-variable warning
- * that is enabled in gcc 4.6 
+ * that is enabled in gcc 4.6
  */
 
 #define IGNORE_UNUSED(x) { x = x; }
diff --git a/includes/ctrace.h b/includes/ctrace.h
index d21bd2e2..b87505c7 100644
--- a/includes/ctrace.h
+++ b/includes/ctrace.h
@@ -61,7 +61,7 @@ void trace_inpacket_stop (trace_type_t *);
 void trace_outpacket_input (trace_type_t *, unsigned, char *);
 void trace_outpacket_stop (trace_type_t *);
 ssize_t trace_packet_send (struct interface_info *,
-			   struct packet *, struct dhcp_packet *, size_t, 
+			   struct packet *, struct dhcp_packet *, size_t,
 			   struct in_addr,
 			   struct sockaddr_in *, struct hardware *);
 void trace_icmp_input_input (trace_type_t *, unsigned, char *);
diff --git a/includes/dhcp.h b/includes/dhcp.h
index ae621c15..8f181bbe 100644
--- a/includes/dhcp.h
+++ b/includes/dhcp.h
@@ -202,4 +202,3 @@ struct dhcp_packet {
 #define VENDOR_ISC_SUBOPTIONS		2495
 
 #endif /* DHCP_H */
-
diff --git a/includes/dhcpd.h b/includes/dhcpd.h
index 372062d3..d7c8e9cd 100644
--- a/includes/dhcpd.h
+++ b/includes/dhcpd.h
@@ -3910,4 +3910,3 @@ void lc_delete_all(struct leasechain *lc);
 #define FIND_POND6_PERCENT(count, percent)	\
 	((count) > (POND_TRACK_MAX / 100) ?	\
 	 ((count) / 100) * (percent) : ((count) * (percent)) / 100)
-
diff --git a/includes/inet.h b/includes/inet.h
index b68d94d0..4fe2cade 100644
--- a/includes/inet.h
+++ b/includes/inet.h
@@ -56,7 +56,7 @@ struct iaddrmatch {
 };
 
 /* its list ... */
- 
+
 struct iaddrmatchlist {
 	struct iaddrmatchlist *next;
 	struct iaddrmatch match;
@@ -76,4 +76,3 @@ struct iaddrcidrnetlist {
 	struct iaddrcidrnetlist *next;
 	struct iaddrcidrnet cidrnet;
 };
-
diff --git a/includes/ldap_casa.h b/includes/ldap_casa.h
index d0a86a50..3408425b 100644
--- a/includes/ldap_casa.h
+++ b/includes/ldap_casa.h
@@ -1,31 +1,31 @@
 /* ldap_casa.h
-   
+
    Definition for CASA modules... */
 
 /* Copyright (c) 2006 Novell, Inc.
 
  * All rights reserved.
- * Redistribution and use in source and binary forms, with or without 
- * modification, are permitted provided that the following conditions are met: 
- * 1.Redistributions of source code must retain the above copyright notice, 
- *   this list of conditions and the following disclaimer. 
- * 2.Redistributions in binary form must reproduce the above copyright notice, 
- *   this list of conditions and the following disclaimer in the documentation 
- *   and/or other materials provided with the distribution. 
- * 3.Neither the name of ISC, ISC DHCP, nor the names of its contributors 
- *   may be used to endorse or promote products derived from this software 
- *   without specific prior written permission. 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 1.Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * 2.Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * 3.Neither the name of ISC, ISC DHCP, nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
 
- * THIS SOFTWARE IS PROVIDED BY INTERNET SYSTEMS CONSORTIUM AND CONTRIBUTORS 
+ * THIS SOFTWARE IS PROVIDED BY INTERNET SYSTEMS CONSORTIUM AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ISC OR CONTRIBUTORS BE LIABLE 
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ISC OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
 
  * This file was written by S Kalyanasundaram <skalyanasundaram@novell.com>
@@ -69,7 +69,7 @@ SSCS_TYPEDEF_LIBCALL(int, CASA_GetCredential_T)
        SSCS_SECRET_ID_T   *sharedSecretID,
        uint32_t           *credentialType,
        void               *credential,
-       SSCS_EXT_T         *ext 
+       SSCS_EXT_T         *ext
 );
 SSCS_TYPEDEF_LIBCALL(int, CASA_SetCredential_T)
 (
@@ -99,4 +99,3 @@ int load_uname_pwd_from_miCASA(char **, char **);
 
 #endif /* __LDAP_CASA_H__ */
 #endif /* LDAP_CASA_AUTH */
-
diff --git a/includes/omapip/buffer.h b/includes/omapip/buffer.h
index 693432f0..4970e1dd 100644
--- a/includes/omapip/buffer.h
+++ b/includes/omapip/buffer.h
@@ -52,7 +52,7 @@ typedef struct _omapi_buffer {
 	u_int16_t head, tail;		/* Buffers are organized in a ring. */
 	char buf [OMAPI_BUF_SIZE];	/* The actual buffer is included in
 					   the buffer data structure. */
-} omapi_buffer_t;	
+} omapi_buffer_t;
 
 #define BUFFER_BYTES_FREE(x)	\
 	((x) -> tail > (x) -> head \
@@ -74,4 +74,3 @@ isc_result_t omapi_connection_get_uint32 (omapi_object_t *, u_int32_t *);
 isc_result_t omapi_connection_put_uint32 (omapi_object_t *, u_int32_t);
 isc_result_t omapi_connection_get_uint16 (omapi_object_t *, u_int16_t *);
 isc_result_t omapi_connection_put_uint16 (omapi_object_t *, u_int32_t);
-
diff --git a/includes/omapip/omapip.h b/includes/omapip/omapip.h
index 0b7bd04e..9bcd9cb7 100644
--- a/includes/omapip/omapip.h
+++ b/includes/omapip/omapip.h
@@ -93,7 +93,7 @@ typedef struct {
 typedef struct __omapi_object_type_t {
 	const char *name;
 	struct __omapi_object_type_t *next;
-	
+
 	isc_result_t (*set_value) (omapi_object_t *, omapi_object_t *,
 				   omapi_data_string_t *,
 				   omapi_typed_data_t *);
@@ -284,7 +284,7 @@ isc_result_t omapi_protocol_set_value (omapi_object_t *, omapi_object_t *,
 				       omapi_typed_data_t *);
 isc_result_t omapi_protocol_get_value (omapi_object_t *, omapi_object_t *,
 				       omapi_data_string_t *,
-				       omapi_value_t **); 
+				       omapi_value_t **);
 isc_result_t omapi_protocol_stuff_values (omapi_object_t *,
 					  omapi_object_t *,
 					  omapi_object_t *);
@@ -303,7 +303,7 @@ isc_result_t omapi_protocol_listener_set_value (omapi_object_t *,
 isc_result_t omapi_protocol_listener_get_value (omapi_object_t *,
 						omapi_object_t *,
 						omapi_data_string_t *,
-						omapi_value_t **); 
+						omapi_value_t **);
 isc_result_t omapi_protocol_listener_destroy (omapi_object_t *,
 					      const char *, int);
 isc_result_t omapi_protocol_listener_signal (omapi_object_t *,
@@ -334,7 +334,7 @@ isc_result_t omapi_connection_set_value (omapi_object_t *, omapi_object_t *,
 					 omapi_typed_data_t *);
 isc_result_t omapi_connection_get_value (omapi_object_t *, omapi_object_t *,
 					 omapi_data_string_t *,
-					 omapi_value_t **); 
+					 omapi_value_t **);
 isc_result_t omapi_connection_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_connection_signal_handler (omapi_object_t *,
 					      const char *, va_list);
@@ -365,7 +365,7 @@ isc_result_t omapi_listener_set_value (omapi_object_t *, omapi_object_t *,
 				       omapi_typed_data_t *);
 isc_result_t omapi_listener_get_value (omapi_object_t *, omapi_object_t *,
 				       omapi_data_string_t *,
-				       omapi_value_t **); 
+				       omapi_value_t **);
 isc_result_t omapi_listener_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_listener_signal_handler (omapi_object_t *,
 					    const char *, va_list);
@@ -393,7 +393,7 @@ isc_result_t omapi_io_set_value (omapi_object_t *, omapi_object_t *,
 				 omapi_data_string_t *,
 				 omapi_typed_data_t *);
 isc_result_t omapi_io_get_value (omapi_object_t *, omapi_object_t *,
-				 omapi_data_string_t *, omapi_value_t **); 
+				 omapi_data_string_t *, omapi_value_t **);
 isc_result_t omapi_io_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_io_signal_handler (omapi_object_t *, const char *, va_list);
 isc_result_t omapi_io_stuff_values (omapi_object_t *,
@@ -411,7 +411,7 @@ isc_result_t omapi_generic_set_value  (omapi_object_t *, omapi_object_t *,
 				       omapi_typed_data_t *);
 isc_result_t omapi_generic_get_value (omapi_object_t *, omapi_object_t *,
 				      omapi_data_string_t *,
-				      omapi_value_t **); 
+				      omapi_value_t **);
 isc_result_t omapi_generic_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_generic_signal_handler (omapi_object_t *,
 					   const char *, va_list);
@@ -426,7 +426,7 @@ isc_result_t omapi_message_set_value  (omapi_object_t *, omapi_object_t *,
 				       omapi_typed_data_t *);
 isc_result_t omapi_message_get_value (omapi_object_t *, omapi_object_t *,
 				      omapi_data_string_t *,
-				      omapi_value_t **); 
+				      omapi_value_t **);
 isc_result_t omapi_message_destroy (omapi_object_t *, const char *, int);
 isc_result_t omapi_message_signal_handler (omapi_object_t *,
 					   const char *, va_list);
@@ -448,7 +448,7 @@ isc_result_t omapi_auth_key_lookup (omapi_object_t **,
 				    omapi_object_t *);
 isc_result_t omapi_auth_key_get_value (omapi_object_t *, omapi_object_t *,
 				       omapi_data_string_t *,
-				       omapi_value_t **); 
+				       omapi_value_t **);
 isc_result_t omapi_auth_key_stuff_values (omapi_object_t *,
 					  omapi_object_t *,
 					  omapi_object_t *);
@@ -520,9 +520,9 @@ isc_result_t omapi_set_string_value (omapi_object_t *, omapi_object_t *,
 				     const char *, const char *);
 isc_result_t omapi_get_value (omapi_object_t *, omapi_object_t *,
 			      omapi_data_string_t *,
-			      omapi_value_t **); 
+			      omapi_value_t **);
 isc_result_t omapi_get_value_str (omapi_object_t *, omapi_object_t *,
-				  const char *, omapi_value_t **); 
+				  const char *, omapi_value_t **);
 isc_result_t omapi_stuff_values (omapi_object_t *,
 				 omapi_object_t *,
 				 omapi_object_t *);
diff --git a/includes/omapip/omapip_p.h b/includes/omapip/omapip_p.h
index fbbd1182..b744a5ce 100644
--- a/includes/omapip/omapip_p.h
+++ b/includes/omapip/omapip_p.h
@@ -134,7 +134,7 @@ typedef struct __omapi_remote_auth {
 
 typedef struct __omapi_protocol_object {
 	OMAPI_OBJECT_PREAMBLE;
-	u_int32_t header_size;		
+	u_int32_t header_size;
 	u_int32_t protocol_version;
 	u_int32_t next_xid;
 
diff --git a/includes/omapip/result.h b/includes/omapip/result.h
index b38c748f..7edf0c45 100644
--- a/includes/omapip/result.h
+++ b/includes/omapip/result.h
@@ -84,36 +84,36 @@
 #ifdef INCLUDE_OLD_DHCP_ISC_ERROR_CODES
 #define ISC_R_HOSTUNKNOWN	DHCP_R_HOSTUNKNOWN
 #define ISC_R_VERSIONMISMATCH	DHCP_R_VERSIONMISMATCH
-#define ISC_R_PROTOCOLERROR	DHCP_R_PROTOCOLERROR	
-#define ISC_R_INVALIDARG	DHCP_R_INVALIDARG	
-#define ISC_R_NOTYET		DHCP_R_NOTYET		
-#define ISC_R_UNCHANGED		DHCP_R_UNCHANGED		
-#define ISC_R_KEYCONFLICT	DHCP_R_KEYCONFLICT	
-#define ISC_R_BADPARSE		DHCP_R_BADPARSE		
-#define ISC_R_NOKEYS		DHCP_R_NOKEYS		
-#define ISC_R_KEY_UNKNOWN	DHCP_R_KEY_UNKNOWN	
-#define ISC_R_INVALIDKEY	DHCP_R_INVALIDKEY	
-#define ISC_R_INCOMPLETE	DHCP_R_INCOMPLETE	
-#define ISC_R_FORMERR		DHCP_R_FORMERR		
-#define ISC_R_SERVFAIL		DHCP_R_SERVFAIL		
-#define ISC_R_NXDOMAIN		DHCP_R_NXDOMAIN		
-#define ISC_R_NOTIMPL		DHCP_R_NOTIMPL		
-#define ISC_R_REFUSED		DHCP_R_REFUSED		
-#define ISC_R_YXDOMAIN		DHCP_R_YXDOMAIN		
-#define ISC_R_YXRRSET		DHCP_R_YXRRSET		
-#define ISC_R_NXRRSET		DHCP_R_NXRRSET		
-#define ISC_R_NOTAUTH		DHCP_R_NOTAUTH		
-#define ISC_R_NOTZONE		DHCP_R_NOTZONE		
-#define ISC_R_BADSIG		DHCP_R_BADSIG		
-#define ISC_R_BADKEY		DHCP_R_BADKEY		
-#define ISC_R_BADTIME		DHCP_R_BADTIME		
-#define ISC_R_NOROOTZONE	DHCP_R_NOROOTZONE	
-#define ISC_R_DESTADDRREQ	DHCP_R_DESTADDRREQ	
-#define ISC_R_CROSSZONE		DHCP_R_CROSSZONE		
-#define ISC_R_NO_TSIG		DHCP_R_NO_TSIG		
-#define ISC_R_NOT_EQUAL		DHCP_R_NOT_EQUAL		
-#define ISC_R_CONNRESET		DHCP_R_CONNRESET		
-#define ISC_R_UNKNOWNATTRIBUTE	DHCP_R_UNKNOWNATTRIBUTE	
+#define ISC_R_PROTOCOLERROR	DHCP_R_PROTOCOLERROR
+#define ISC_R_INVALIDARG	DHCP_R_INVALIDARG
+#define ISC_R_NOTYET		DHCP_R_NOTYET
+#define ISC_R_UNCHANGED		DHCP_R_UNCHANGED
+#define ISC_R_KEYCONFLICT	DHCP_R_KEYCONFLICT
+#define ISC_R_BADPARSE		DHCP_R_BADPARSE
+#define ISC_R_NOKEYS		DHCP_R_NOKEYS
+#define ISC_R_KEY_UNKNOWN	DHCP_R_KEY_UNKNOWN
+#define ISC_R_INVALIDKEY	DHCP_R_INVALIDKEY
+#define ISC_R_INCOMPLETE	DHCP_R_INCOMPLETE
+#define ISC_R_FORMERR		DHCP_R_FORMERR
+#define ISC_R_SERVFAIL		DHCP_R_SERVFAIL
+#define ISC_R_NXDOMAIN		DHCP_R_NXDOMAIN
+#define ISC_R_NOTIMPL		DHCP_R_NOTIMPL
+#define ISC_R_REFUSED		DHCP_R_REFUSED
+#define ISC_R_YXDOMAIN		DHCP_R_YXDOMAIN
+#define ISC_R_YXRRSET		DHCP_R_YXRRSET
+#define ISC_R_NXRRSET		DHCP_R_NXRRSET
+#define ISC_R_NOTAUTH		DHCP_R_NOTAUTH
+#define ISC_R_NOTZONE		DHCP_R_NOTZONE
+#define ISC_R_BADSIG		DHCP_R_BADSIG
+#define ISC_R_BADKEY		DHCP_R_BADKEY
+#define ISC_R_BADTIME		DHCP_R_BADTIME
+#define ISC_R_NOROOTZONE	DHCP_R_NOROOTZONE
+#define ISC_R_DESTADDRREQ	DHCP_R_DESTADDRREQ
+#define ISC_R_CROSSZONE		DHCP_R_CROSSZONE
+#define ISC_R_NO_TSIG		DHCP_R_NO_TSIG
+#define ISC_R_NOT_EQUAL		DHCP_R_NOT_EQUAL
+#define ISC_R_CONNRESET		DHCP_R_CONNRESET
+#define ISC_R_UNKNOWNATTRIBUTE	DHCP_R_UNKNOWNATTRIBUTE
 #endif
 
 isc_result_t
diff --git a/includes/omapip/trace.h b/includes/omapip/trace.h
index e0493c5e..3e14a08b 100644
--- a/includes/omapip/trace.h
+++ b/includes/omapip/trace.h
@@ -29,7 +29,7 @@
 #define TRACEFILE_MAGIC		0x64484370UL	/* dHCp */
 #define TRACEFILE_VERSION	1
 
-/* The first thing in a trace file is the header, which basically just 
+/* The first thing in a trace file is the header, which basically just
    defines the version of the file. */
 typedef struct {
 	u_int32_t magic;	/* Magic number for trace file. */
diff --git a/includes/statement.h b/includes/statement.h
index 18d44599..71f27d32 100644
--- a/includes/statement.h
+++ b/includes/statement.h
@@ -102,4 +102,3 @@ struct executable_statement {
 		} execute;
 	} data;
 };
-
diff --git a/includes/tree.h b/includes/tree.h
index 47e9b2e0..b0574fb1 100644
--- a/includes/tree.h
+++ b/includes/tree.h
@@ -47,7 +47,7 @@ struct enumeration {
 	const char *name;
 	unsigned width;
 	struct enumeration_value *values;
-};	
+};
 
 /* Tree node types... */
 #define TREE_CONCAT		1
@@ -69,7 +69,7 @@ struct buffer {
    XXX ephemeral by default and be made a persistent reference explicitly. */
 /* XXX on the other hand, it seems to work pretty nicely, so maybe the
    XXX above comment is meshuggenah. */
-/* XXX I think the above comment tries to say this: 
+/* XXX I think the above comment tries to say this:
    XXX    http://tinyurl.com/2tjqre */
 
 /* A string of data bytes, possibly accompanied by a larger buffer. */
@@ -281,7 +281,7 @@ struct expression {
 	} data;
 	int flags;
 #	define EXPR_EPHEMERAL	1
-};		
+};
 
 /* DNS host entry structure... */
 struct dns_host_entry {