From: Roy Marples <roy@marples.name>
Date: Thu, 12 Feb 2009 01:09:37 +0000 (+0000)
Subject: More style updates.
X-Git-Tag: v5.0.0~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40dbcc878593552d31ecc4a1fcdf2f4672fd736b;p=thirdparty%2Fdhcpcd.git

More style updates.
---

diff --git a/bind.h b/bind.h
index a8d6e3a8..8ce10751 100644
--- a/bind.h
+++ b/bind.h
@@ -30,7 +30,7 @@
 
 #include "config.h"
 #ifdef THERE_IS_NO_FORK
-#define daemonise() {}
+# define daemonise() {}
 #else
 pid_t daemonise(void);
 #endif
diff --git a/common.c b/common.c
index 98fd7ba9..90651c9e 100644
--- a/common.c
+++ b/common.c
@@ -1,6 +1,6 @@
 /* 
  * dhcpcd - DHCP client daemon
- * Copyright 2006-2008 Roy Marples <roy@marples.name>
+ * Copyright 2006-2009 Roy Marples <roy@marples.name>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
diff --git a/common.h b/common.h
index e12d0054..3df9e1ec 100644
--- a/common.h
+++ b/common.h
@@ -1,6 +1,6 @@
 /* 
  * dhcpcd - DHCP client daemon
- * Copyright 2006-2008 Roy Marples <roy@marples.name>
+ * Copyright 2006-2009 Roy Marples <roy@marples.name>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
@@ -38,12 +38,12 @@
 #define UNCONST(a)		((void *)(unsigned long)(const void *)(a))
 
 #define timeval_to_double(tv) ((tv)->tv_sec * 1.0 + (tv)->tv_usec * 1.0e-6)
-#define timernorm(tvp)						\
-	do {							\
-		while ((tvp)->tv_usec >= 1000000) {		\
-			(tvp)->tv_sec++;			\
-			(tvp)->tv_usec -= 1000000;		\
-		}						\
+#define timernorm(tvp)							\
+	do {								\
+		while ((tvp)->tv_usec >= 1000000) {			\
+			(tvp)->tv_sec++;				\
+			(tvp)->tv_usec -= 1000000;			\
+		}							\
 	} while (0 /* CONSTCOND */);
 
 #if __GNUC__ > 2 || defined(__INTEL_COMPILER)
diff --git a/dhcp.h b/dhcp.h
index 2ad5fab0..d3d366bc 100644
--- a/dhcp.h
+++ b/dhcp.h
@@ -77,8 +77,7 @@
 #define PROBE_MAX_U		PROBE_MAX * USECS_SECOND
 
 /* DHCP options */
-enum DHO
-{
+enum DHO {
 	DHO_PAD                    = 0,
 	DHO_SUBNETMASK             = 1,
 	DHO_ROUTER                 = 3,
diff --git a/dhcpf.h b/dhcpf.h
index 04d70493..cc473385 100644
--- a/dhcpf.h
+++ b/dhcpf.h
@@ -1,6 +1,6 @@
 /* 
  * dhcpcd - DHCP client daemon
- * Copyright 2006-2008 Roy Marples <roy@marples.name>
+ * Copyright 2006-2009 Roy Marples <roy@marples.name>
  * All rights reserved
 
  * Redistribution and use in source and binary forms, with or without
@@ -42,12 +42,12 @@ int get_option_addr(uint32_t *, const struct dhcp_message *, uint8_t);
 int get_option_uint32(uint32_t *, const struct dhcp_message *, uint8_t);
 int get_option_uint16(uint16_t *, const struct dhcp_message *, uint8_t);
 int get_option_uint8(uint8_t *, const struct dhcp_message *, uint8_t);
-#define is_bootp(m) (m && \
-	!IN_LINKLOCAL(htonl((m)->yiaddr)) && \
-	get_option_uint8(NULL, m, DHO_MESSAGETYPE) == -1)
+#define is_bootp(m) (m &&						\
+	    !IN_LINKLOCAL(htonl((m)->yiaddr)) &&			\
+	    get_option_uint8(NULL, m, DHO_MESSAGETYPE) == -1)
 struct rt *get_option_routes(const struct dhcp_message *);
 ssize_t configure_env(char **, const char *, const struct dhcp_message *,
-		      const struct if_options *);
+    const struct if_options *);
 
 ssize_t make_message(struct dhcp_message **, const struct interface *, uint8_t);
 int valid_dhcp_packet(unsigned char *);