Module Name:    src
Committed By:   martin
Date:           Wed Apr 20 19:40:01 UTC 2011

Modified Files:
        src/common/lib/libprop: prop_dictionary.c

Log Message:
Fix "address of a void*" vs. void* confusion.
Part of fixing PR lib/43964.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/common/lib/libprop/prop_dictionary.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.36 src/common/lib/libprop/prop_dictionary.c:1.37
--- src/common/lib/libprop/prop_dictionary.c:1.36	Fri Sep 24 22:51:52 2010
+++ src/common/lib/libprop/prop_dictionary.c	Wed Apr 20 19:40:00 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: prop_dictionary.c,v 1.36 2010/09/24 22:51:52 rmind Exp $	*/
+/*	$NetBSD: prop_dictionary.c,v 1.37 2011/04/20 19:40:00 martin Exp $	*/
 
 /*-
  * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc.
@@ -523,8 +523,8 @@
 	*stored_pointer1 = (void *)(idx + 1);
 	*stored_pointer2 = (void *)(idx + 1);
 
-	*next_obj1 = &dict1->pd_array[idx].pde_objref;
-	*next_obj2 = &dict2->pd_array[idx].pde_objref;
+	*next_obj1 = dict1->pd_array[idx].pde_objref;
+	*next_obj2 = dict2->pd_array[idx].pde_objref;
 
 	if (!prop_dictionary_keysym_equals(dict1->pd_array[idx].pde_key,
 					   dict2->pd_array[idx].pde_key))

Reply via email to