[src/trunk]: src/common/lib/libprop Make this compilable with gcc 4.8.1 witho...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d3804102bb0
branches:  trunk
changeset: 790620:2d3804102bb0
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Oct 18 18:26:20 2013 +0000

description:
Make this compilable with gcc 4.8.1 without options DIAGNOSTIC.

diffstat:

 common/lib/libprop/prop_dictionary.c |  4 ++--
 common/lib/libprop/prop_number.c     |  4 ++--
 common/lib/libprop/prop_object.c     |  4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 128737db1299 -r 2d3804102bb0 common/lib/libprop/prop_dictionary.c
--- a/common/lib/libprop/prop_dictionary.c      Fri Oct 18 17:48:44 2013 +0000
+++ b/common/lib/libprop/prop_dictionary.c      Fri Oct 18 18:26:20 2013 +0000
@@ -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 @@
        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
diff -r 128737db1299 -r 2d3804102bb0 common/lib/libprop/prop_number.c
--- a/common/lib/libprop/prop_number.c  Fri Oct 18 17:48:44 2013 +0000
+++ b/common/lib/libprop/prop_number.c  Fri Oct 18 18:26:20 2013 +0000
@@ -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 @@
        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);
 }
 
 /*
diff -r 128737db1299 -r 2d3804102bb0 common/lib/libprop/prop_object.c
--- a/common/lib/libprop/prop_object.c  Fri Oct 18 17:48:44 2013 +0000
+++ b/common/lib/libprop/prop_object.c  Fri Oct 18 18:26:20 2013 +0000
@@ -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 @@
 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);