Module Name: src
Committed By: martin
Date: Fri Oct 18 18:26:20 UTC 2013
Modified Files:
src/common/lib/libprop: prop_dictionary.c prop_number.c prop_object.c
Log Message:
Make this compilable with gcc 4.8.1 without options DIAGNOSTIC.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/common/lib/libprop/prop_dictionary.c
cvs rdiff -u -r1.24 -r1.25 src/common/lib/libprop/prop_number.c
cvs rdiff -u -r1.28 -r1.29 src/common/lib/libprop/prop_object.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_dictionary.c
diff -u src/common/lib/libprop/prop_dictionary.c:1.38 src/common/lib/libprop/prop_dictionary.c:1.39
--- src/common/lib/libprop/prop_dictionary.c:1.38 Fri Jul 27 09:10:59 2012
+++ src/common/lib/libprop/prop_dictionary.c Fri Oct 18 18:26:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_dictionary.c,v 1.38 2012/07/27 09:10:59 pooka Exp $ */
+/* $NetBSD: prop_dictionary.c,v 1.39 2013/10/18 18:26:20 martin Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -338,7 +338,7 @@ _prop_dict_keysym_alloc(const char *key)
rpdk = _prop_rb_tree_insert_node(&_prop_dict_keysym_tree, pdk);
_PROP_ASSERT(rpdk == pdk);
_PROP_MUTEX_UNLOCK(_prop_dict_keysym_tree_mutex);
- return (pdk);
+ return (rpdk);
}
static _prop_object_free_rv_t
Index: src/common/lib/libprop/prop_number.c
diff -u src/common/lib/libprop/prop_number.c:1.24 src/common/lib/libprop/prop_number.c:1.25
--- src/common/lib/libprop/prop_number.c:1.24 Fri Jul 27 09:10:59 2012
+++ src/common/lib/libprop/prop_number.c Fri Oct 18 18:26:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_number.c,v 1.24 2012/07/27 09:10:59 pooka Exp $ */
+/* $NetBSD: prop_number.c,v 1.25 2013/10/18 18:26:20 martin Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -314,7 +314,7 @@ _prop_number_alloc(const struct _prop_nu
rpn = _prop_rb_tree_insert_node(&_prop_number_tree, pn);
_PROP_ASSERT(rpn == pn);
_PROP_MUTEX_UNLOCK(_prop_number_tree_mutex);
- return (pn);
+ return (rpn);
}
/*
Index: src/common/lib/libprop/prop_object.c
diff -u src/common/lib/libprop/prop_object.c:1.28 src/common/lib/libprop/prop_object.c:1.29
--- src/common/lib/libprop/prop_object.c:1.28 Fri Jul 27 09:10:59 2012
+++ src/common/lib/libprop/prop_object.c Fri Oct 18 18:26:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: prop_object.c,v 1.28 2012/07/27 09:10:59 pooka Exp $ */
+/* $NetBSD: prop_object.c,v 1.29 2013/10/18 18:26:20 martin Exp $ */
/*-
* Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -987,7 +987,7 @@ void
prop_object_retain(prop_object_t obj)
{
struct _prop_object *po = obj;
- uint32_t ncnt;
+ uint32_t ncnt __unused;
_PROP_ATOMIC_INC32_NV(&po->po_refcnt, ncnt);
_PROP_ASSERT(ncnt != 0);
