Module Name: src
Committed By: matt
Date: Fri Sep 5 05:19:24 UTC 2014
Modified Files:
src/common/lib/libprop: prop_ingest.c prop_number.c
Log Message:
Eliminate use of C++ keywords and don't nest struct definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/common/lib/libprop/prop_ingest.c
cvs rdiff -u -r1.26 -r1.27 src/common/lib/libprop/prop_number.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libprop/prop_ingest.c
diff -u src/common/lib/libprop/prop_ingest.c:1.4 src/common/lib/libprop/prop_ingest.c:1.5
--- src/common/lib/libprop/prop_ingest.c:1.4 Fri Jul 27 09:10:59 2012
+++ src/common/lib/libprop/prop_ingest.c Fri Sep 5 05:19:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_ingest.c,v 1.4 2012/07/27 09:10:59 pooka Exp $ */
+/* $NetBSD: prop_ingest.c,v 1.5 2014/09/05 05:19:24 matt Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -44,7 +44,7 @@ struct _prop_ingest_context {
* Allocate and initialize an ingest context.
*/
prop_ingest_context_t
-prop_ingest_context_alloc(void *private)
+prop_ingest_context_alloc(void *xprivate)
{
prop_ingest_context_t ctx;
@@ -53,7 +53,7 @@ prop_ingest_context_alloc(void *private)
ctx->pic_error = PROP_INGEST_ERROR_NO_ERROR;
ctx->pic_type = PROP_TYPE_UNKNOWN;
ctx->pic_key = NULL;
- ctx->pic_private = private;
+ ctx->pic_private = xprivate;
}
return (ctx);
}
Index: src/common/lib/libprop/prop_number.c
diff -u src/common/lib/libprop/prop_number.c:1.26 src/common/lib/libprop/prop_number.c:1.27
--- src/common/lib/libprop/prop_number.c:1.26 Wed Mar 26 18:12:46 2014
+++ src/common/lib/libprop/prop_number.c Fri Sep 5 05:19:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_number.c,v 1.26 2014/03/26 18:12:46 christos Exp $ */
+/* $NetBSD: prop_number.c,v 1.27 2014/09/05 05:19:24 matt Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -43,19 +43,21 @@
#include <stdlib.h>
#endif
+struct _prop_number_value {
+ union {
+ int64_t pnu_signed;
+ uint64_t pnu_unsigned;
+ } pnv_un;
+#define pnv_signed pnv_un.pnu_signed
+#define pnv_unsigned pnv_un.pnu_unsigned
+ unsigned int pnv_is_unsigned :1,
+ :31;
+};
+
struct _prop_number {
struct _prop_object pn_obj;
struct rb_node pn_link;
- struct _prop_number_value {
- union {
- int64_t pnu_signed;
- uint64_t pnu_unsigned;
- } pnv_un;
-#define pnv_signed pnv_un.pnu_signed
-#define pnv_unsigned pnv_un.pnu_unsigned
- unsigned int pnv_is_unsigned :1,
- :31;
- } pn_value;
+ struct _prop_number_value pn_value;
};
_PROP_POOL_INIT(_prop_number_pool, sizeof(struct _prop_number), "propnmbr")
