Author: pjd
Date: Sun Oct 24 17:22:34 2010
New Revision: 214282
URL: http://svn.freebsd.org/changeset/base/214282
Log:
Move all NV defines into nv.c, they are not used externally thus there is
no need to make then visible from outside.
MFC after: 3 days
Modified:
head/sbin/hastd/nv.c
head/sbin/hastd/nv.h
Modified: head/sbin/hastd/nv.c
==============================================================================
--- head/sbin/hastd/nv.c Sun Oct 24 17:06:49 2010 (r214281)
+++ head/sbin/hastd/nv.c Sun Oct 24 17:22:34 2010 (r214282)
@@ -46,6 +46,33 @@ __FBSDID("$FreeBSD$");
#include <ebuf.h>
#include <nv.h>
+#define NV_TYPE_INT8 1
+#define NV_TYPE_UINT8 2
+#define NV_TYPE_INT16 3
+#define NV_TYPE_UINT16 4
+#define NV_TYPE_INT32 5
+#define NV_TYPE_UINT32 6
+#define NV_TYPE_INT64 7
+#define NV_TYPE_UINT64 8
+#define NV_TYPE_INT8_ARRAY 9
+#define NV_TYPE_UINT8_ARRAY 10
+#define NV_TYPE_INT16_ARRAY 11
+#define NV_TYPE_UINT16_ARRAY 12
+#define NV_TYPE_INT32_ARRAY 13
+#define NV_TYPE_UINT32_ARRAY 14
+#define NV_TYPE_INT64_ARRAY 15
+#define NV_TYPE_UINT64_ARRAY 16
+#define NV_TYPE_STRING 17
+
+#define NV_TYPE_MASK 0x7f
+#define NV_TYPE_FIRST NV_TYPE_INT8
+#define NV_TYPE_LAST NV_TYPE_STRING
+
+#define NV_ORDER_NETWORK 0x00
+#define NV_ORDER_HOST 0x80
+
+#define NV_ORDER_MASK 0x80
+
#define NV_MAGIC 0xaea1e
struct nv {
int nv_magic;
Modified: head/sbin/hastd/nv.h
==============================================================================
--- head/sbin/hastd/nv.h Sun Oct 24 17:06:49 2010 (r214281)
+++ head/sbin/hastd/nv.h Sun Oct 24 17:22:34 2010 (r214282)
@@ -41,33 +41,6 @@
#include <ebuf.h>
-#define NV_TYPE_INT8 1
-#define NV_TYPE_UINT8 2
-#define NV_TYPE_INT16 3
-#define NV_TYPE_UINT16 4
-#define NV_TYPE_INT32 5
-#define NV_TYPE_UINT32 6
-#define NV_TYPE_INT64 7
-#define NV_TYPE_UINT64 8
-#define NV_TYPE_INT8_ARRAY 9
-#define NV_TYPE_UINT8_ARRAY 10
-#define NV_TYPE_INT16_ARRAY 11
-#define NV_TYPE_UINT16_ARRAY 12
-#define NV_TYPE_INT32_ARRAY 13
-#define NV_TYPE_UINT32_ARRAY 14
-#define NV_TYPE_INT64_ARRAY 15
-#define NV_TYPE_UINT64_ARRAY 16
-#define NV_TYPE_STRING 17
-
-#define NV_TYPE_MASK 0x7f
-#define NV_TYPE_FIRST NV_TYPE_INT8
-#define NV_TYPE_LAST NV_TYPE_STRING
-
-#define NV_ORDER_NETWORK 0x00
-#define NV_ORDER_HOST 0x80
-
-#define NV_ORDER_MASK 0x80
-
struct nv;
struct nv *nv_alloc(void);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
