[ovs-dev] [includes 11/11] Remove unneeded inclusions of util.h.

Ben Pfaff blp at nicira.com
Thu May 23 04:37:44 UTC 2013


---
 lib/dynamic-string.c |    1 -
 lib/hash.c           |    1 +
 lib/hash.h           |    1 -
 lib/ofp-msgs.h       |    1 -
 lib/ofp-print.c      |    1 -
 lib/ofpbuf.c         |    1 -
 lib/unaligned.h      |    3 +--
 7 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/dynamic-string.c b/lib/dynamic-string.c
index 3cccb5c..7c47878 100644
--- a/lib/dynamic-string.c
+++ b/lib/dynamic-string.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <time.h>
 #include "timeval.h"
-#include "util.h"
 
 /* Initializes 'ds' as an empty string buffer. */
 void
diff --git a/lib/hash.c b/lib/hash.c
index e954d78..d360e52 100644
--- a/lib/hash.c
+++ b/lib/hash.c
@@ -17,6 +17,7 @@
 #include "hash.h"
 #include <string.h>
 #include "unaligned.h"
+#include "util.h"
 
 /* Returns the hash of 'a', 'b', and 'c'. */
 uint32_t
diff --git a/lib/hash.h b/lib/hash.h
index f8a72ed..ce12652 100644
--- a/lib/hash.h
+++ b/lib/hash.h
@@ -20,7 +20,6 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <string.h>
-#include "util.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/lib/ofp-msgs.h b/lib/ofp-msgs.h
index 66ec448..0442641 100644
--- a/lib/ofp-msgs.h
+++ b/lib/ofp-msgs.h
@@ -40,7 +40,6 @@
 
 #include "openvswitch/types.h"
 #include "ofp-errors.h"
-#include "util.h"
 
 struct list;
 
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index e3a70ab..3e8b841 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -39,7 +39,6 @@
 #include "openflow/nicira-ext.h"
 #include "packets.h"
 #include "unaligned.h"
-#include "util.h"
 
 static void ofp_print_queue_name(struct ds *string, uint32_t port);
 static void ofp_print_error(struct ds *, enum ofperr);
diff --git a/lib/ofpbuf.c b/lib/ofpbuf.c
index f7145db..d830ee2 100644
--- a/lib/ofpbuf.c
+++ b/lib/ofpbuf.c
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "dynamic-string.h"
-#include "util.h"
 
 static void
 ofpbuf_use__(struct ofpbuf *b, void *base, size_t allocated,
diff --git a/lib/unaligned.h b/lib/unaligned.h
index 2654a27..df265b4 100644
--- a/lib/unaligned.h
+++ b/lib/unaligned.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2011 Nicira, Inc.
+ * Copyright (c) 2010, 2011, 2013 Nicira, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 #include "byte-order.h"
 #include "openvswitch/types.h"
 #include "type-props.h"
-#include "util.h"
 
 /* Public API. */
 static inline uint16_t get_unaligned_u16(const uint16_t *);
-- 
1.7.10.4




More information about the dev mailing list