From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10595 invoked by alias); 8 Apr 2011 14:14:59 -0000 Received: (qmail 10574 invoked by uid 9737); 8 Apr 2011 14:14:58 -0000 Date: Fri, 08 Apr 2011 14:14:00 -0000 Message-ID: <20110408141458.10572.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/lib/datastruct btree.c Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: lvm2-cvs-owner@sourceware.org X-SW-Source: 2011-04/txt/msg00007.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2011-04-08 14:14:58 Modified files: lib/datastruct : btree.c Log message: Better const cast logic (although still gcc gives const violation warning) Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/datastruct/btree.c.diff?cvsroot=lvm2&r1=1.14&r2=1.15 --- LVM2/lib/datastruct/btree.c 2010/12/20 13:19:13 1.14 +++ LVM2/lib/datastruct/btree.c 2011/04/08 14:14:57 1.15 @@ -55,7 +55,7 @@ #endif } -static struct node **_lookup(struct node *const *c, uint32_t key, +static struct node *const *_lookup(struct node *const *c, uint32_t key, struct node **p) { *p = NULL; @@ -71,20 +71,20 @@ c = &(*c)->r; } - return (struct node **)c; + return c; } void *btree_lookup(const struct btree *t, uint32_t k) { uint32_t key = _shuffle(k); - struct node *p, **c = _lookup(&t->root, key, &p); + struct node *p, *const *c = _lookup(&t->root, key, &p); return (*c) ? (*c)->data : NULL; } int btree_insert(struct btree *t, uint32_t k, void *data) { uint32_t key = _shuffle(k); - struct node *p, **c = _lookup(&t->root, key, &p), *n; + struct node *p, **c = (struct node **) _lookup(&t->root, key, &p), *n; if (!*c) { if (!(n = dm_pool_alloc(t->mem, sizeof(*n))))