From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8010 invoked by alias); 1 Sep 2011 14:02:09 -0000 Received: (qmail 7990 invoked by uid 9737); 1 Sep 2011 14:02:08 -0000 Date: Thu, 01 Sep 2011 14:02:00 -0000 Message-ID: <20110901140208.7987.qmail@sourceware.org> From: zkabelac@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/libdm libdm-config.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-09/txt/msg00005.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: zkabelac@sourceware.org 2011-09-01 14:02:07 Modified files: libdm : libdm-config.c Log message: Use const casting when it's needed Keep the lookup operation const and use const casting at the dm_ function level. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-config.c.diff?cvsroot=lvm2&r1=1.3&r2=1.4 --- LVM2/libdm/libdm-config.c 2011/08/31 15:19:20 1.3 +++ LVM2/libdm/libdm-config.c 2011/09/01 14:02:05 1.4 @@ -809,8 +809,8 @@ /* * utility functions */ -static struct dm_config_node *_find_config_node(const void *start, - const char *path) +static const struct dm_config_node *_find_config_node(const void *start, + const char *path) { const char *e; const struct dm_config_node *cn = start; @@ -848,15 +848,15 @@ path = e; } - return (struct dm_config_node *) cn_found; + return cn_found; } -typedef struct dm_config_node *_node_lookup_fn(const void *start, const char *path); +typedef const struct dm_config_node *_node_lookup_fn(const void *start, const char *path); -static struct dm_config_node *_find_first_config_node(const void *start, const char *path) +static const struct dm_config_node *_find_first_config_node(const void *start, const char *path) { const struct dm_config_tree *cft = start; - struct dm_config_node *cn = NULL; + const struct dm_config_node *cn = NULL; while (cft) { if ((cn = _find_config_node(cft->root, path))) @@ -976,7 +976,7 @@ struct dm_config_node *dm_config_find_node(struct dm_config_node *cn, const char *path) { - return _find_config_node(cn, path); + return (struct dm_config_node *) _find_config_node(cn, path); } int dm_config_find_int(const struct dm_config_node *cn, const char *path, int fail)