More style updates.

diff --git a/bind.h b/bind.h
index a8d6e3a818de6a4755fba5db99cec3dbbdb41e29..8ce10751cbc103b6999c2fe293a20b4a036c8e57 100644 (file)
--- 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 98fd7ba9914367d4e131a925fdc17d161848b645..90651c9e92228154e86dde5d95df65aa095336fa 100644 (file)
--- 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 e12d0054aeabba70e97f786ca36540125171d3e9..3df9e1ecbf646b4e2ef8ca1bfce41e6bc773aadf 100644 (file)
--- 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 2ad5fab0cef5ed96db408aa6821ca71d5e6af023..d3d366bc563fad0257b32bbd44679b82f74fcb38 100644 (file)
--- 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 04d70493a6106a95aa756476d7faeb83b0c1f634..cc47338590f70b0afba6c6e19d83a947c62a2677 100644 (file)
--- 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 *);