From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30848 invoked by alias); 1 Mar 2012 19:54:56 -0000 Received: (qmail 30829 invoked by uid 9699); 1 Mar 2012 19:54:55 -0000 Date: Thu, 01 Mar 2012 19:54:00 -0000 Message-ID: <20120301195455.30827.qmail@sourceware.org> From: mornfall@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 libdm/libdevmapper.h 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: 2012-03/txt/msg00011.txt.bz2 CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: mornfall@sourceware.org 2012-03-01 19:54:53 Modified files: libdm : libdevmapper.h libdm-config.c libdaemon/client: daemon-client.h Log message: Use 64 bit integers whenever extracting numbers from daemon replies. Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdevmapper.h.diff?cvsroot=lvm2&r1=1.184&r2=1.185 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-config.c.diff?cvsroot=lvm2&r1=1.22&r2=1.23 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdaemon/client/daemon-client.h.diff?cvsroot=lvm2&r1=1.2&r2=1.3 --- LVM2/libdm/libdevmapper.h 2012/02/23 22:45:43 1.184 +++ LVM2/libdm/libdevmapper.h 2012/03/01 19:54:53 1.185 @@ -1453,6 +1453,7 @@ const char *dm_config_find_str(const struct dm_config_node *cn, const char *path, const char *fail); const char *dm_config_find_str_allow_empty(const struct dm_config_node *cn, const char *path, const char *fail); int dm_config_find_int(const struct dm_config_node *cn, const char *path, int fail); +int64_t dm_config_find_int64(const struct dm_config_node *cn, const char *path, int64_t fail); float dm_config_find_float(const struct dm_config_node *cn, const char *path, float fail); const struct dm_config_node *dm_config_tree_find_node(const struct dm_config_tree *cft, const char *path); --- LVM2/libdm/libdm-config.c 2012/02/28 17:46:47 1.22 +++ LVM2/libdm/libdm-config.c 2012/03/01 19:54:53 1.23 @@ -877,6 +877,11 @@ return (int) _find_config_int64(cn, _find_config_node, path, (int64_t) fail); } +int64_t dm_config_find_int64(const struct dm_config_node *cn, const char *path, int64_t fail) +{ + return _find_config_int64(cn, _find_config_node, path, fail); +} + float dm_config_find_float(const struct dm_config_node *cn, const char *path, float fail) { --- LVM2/libdaemon/client/daemon-client.h 2012/02/28 18:35:05 1.2 +++ LVM2/libdaemon/client/daemon-client.h 2012/03/01 19:54:53 1.3 @@ -90,8 +90,8 @@ void daemon_reply_destroy(daemon_reply r); -static inline int daemon_reply_int(daemon_reply r, const char *path, int def) { - return dm_config_find_int(r.cft->root, path, def); +static inline int64_t daemon_reply_int(daemon_reply r, const char *path, int64_t def) { + return dm_config_find_int64(r.cft->root, path, def); } static inline const char *daemon_reply_str(daemon_reply r, const char *path, const char *def) {