[ovs-dev,v3,14/21] Break uuid.h into private and public parts
diff mbox

Message ID da0ddae5b6b1caa18c03834fa90b022396264620.1458586229.git.ben@skyportsystems.com
State Superseded
Headers show

Commit Message

ben@skyportsystems.com March 21, 2016, 6:58 p.m. UTC
From: Ben Warren <ben@skyportsystems.com>

Public (struct definitions and some prototypes) go in
include/openvswitch

Signed-off-by: Ben Warren <ben@skyportsystems.com>
---
 include/openvswitch/automake.mk |  1 +
 include/openvswitch/uuid.h      | 35 +++++++++++++++++++++++++++++++++++
 lib/ofp-print.c                 |  1 +
 lib/ofp-util.c                  |  1 +
 lib/uuid.h                      | 19 +------------------
 tests/test-uuid.c               |  1 +
 6 files changed, 40 insertions(+), 18 deletions(-)
 create mode 100644 include/openvswitch/uuid.h

Patch
diff mbox

diff --git a/include/openvswitch/automake.mk b/include/openvswitch/automake.mk
index 9990053..a2bc749 100644
--- a/include/openvswitch/automake.mk
+++ b/include/openvswitch/automake.mk
@@ -16,6 +16,7 @@  openvswitchinclude_HEADERS = \
 	include/openvswitch/tun-metadata.h \
 	include/openvswitch/types.h \
 	include/openvswitch/util.h \
+	include/openvswitch/uuid.h \
 	include/openvswitch/version.h \
 	include/openvswitch/vconn.h \
 	include/openvswitch/vlog.h
diff --git a/include/openvswitch/uuid.h b/include/openvswitch/uuid.h
new file mode 100644
index 0000000..383a408
--- /dev/null
+++ b/include/openvswitch/uuid.h
@@ -0,0 +1,35 @@ 
+/* Copyright (c) 2008, 2009, 2010 Nicira, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OPENVSWITCH_UUID_H
+#define OPENVSWITCH_UUID_H 1
+
+#include "openvswitch/util.h"
+
+#define UUID_BIT 128            /* Number of bits in a UUID. */
+#define UUID_OCTET (UUID_BIT / 8) /* Number of bytes in a UUID. */
+
+/* A Universally Unique IDentifier (UUID) compliant with RFC 4122.
+ *
+ * Each of the parts is stored in host byte order, but the parts themselves are
+ * ordered from left to right.  That is, (parts[0] >> 24) is the first 8 bits
+ * of the UUID when output in the standard form, and (parts[3] & 0xff) is the
+ * final 8 bits. */
+struct uuid {
+    uint32_t parts[4];
+};
+BUILD_ASSERT_DECL(sizeof(struct uuid) == UUID_OCTET);
+
+#endif /* uuid.h */
diff --git a/lib/ofp-print.c b/lib/ofp-print.c
index cd91f6b..9cf6cda 100644
--- a/lib/ofp-print.c
+++ b/lib/ofp-print.c
@@ -50,6 +50,7 @@ 
 #include "unaligned.h"
 #include "odp-util.h"
 #include "util.h"
+#include "uuid.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/ofp-util.c b/lib/ofp-util.c
index fcf6bf9..314c8c1 100644
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -48,6 +48,7 @@ 
 #include "openvswitch/ofp-errors.h"
 #include "openvswitch/vlog.h"
 #include "bitmap.h"
+#include "uuid.h"
 
 VLOG_DEFINE_THIS_MODULE(ofp_util);
 
diff --git a/lib/uuid.h b/lib/uuid.h
index 8c6f2f1..a5792b0 100644
--- a/lib/uuid.h
+++ b/lib/uuid.h
@@ -16,24 +16,7 @@ 
 #ifndef UUID_H
 #define UUID_H 1
 
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include "util.h"
-
-#define UUID_BIT 128            /* Number of bits in a UUID. */
-#define UUID_OCTET (UUID_BIT / 8) /* Number of bytes in a UUID. */
-
-/* A Universally Unique IDentifier (UUID) compliant with RFC 4122.
- *
- * Each of the parts is stored in host byte order, but the parts themselves are
- * ordered from left to right.  That is, (parts[0] >> 24) is the first 8 bits
- * of the UUID when output in the standard form, and (parts[3] & 0xff) is the
- * final 8 bits. */
-struct uuid {
-    uint32_t parts[4];
-};
-BUILD_ASSERT_DECL(sizeof(struct uuid) == UUID_OCTET);
+#include "openvswitch/uuid.h"
 
 /* Formats a UUID as a string, in the conventional format.
  *
diff --git a/tests/test-uuid.c b/tests/test-uuid.c
index 65878ea..3b47ab6 100644
--- a/tests/test-uuid.c
+++ b/tests/test-uuid.c
@@ -16,6 +16,7 @@ 
 
 #include <config.h>
 #undef NDEBUG
+#include "util.h"
 #include "uuid.h"
 #include <stdio.h>
 #include "ovstest.h"