From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-1700-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 26873 invoked by alias); 12 Dec 2008 18:45:59 -0000
Received: (qmail 26856 invoked by uid 9447); 12 Dec 2008 18:45:59 -0000
Date: Fri, 12 Dec 2008 18:45:00 -0000
Message-ID: <20081212184559.26854.qmail@sourceware.org>
From: agk@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/libdm libdm-deptree.c
Mailing-List: contact lvm2-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <lvm2-cvs.sourceware.org>
List-Subscribe: <mailto:lvm2-cvs-subscribe@sourceware.org>
List-Post: <mailto:lvm2-cvs@sourceware.org>
List-Help: <mailto:lvm2-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: lvm2-cvs-owner@sourceware.org
X-SW-Source: 2008-12/txt/msg00023.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	agk@sourceware.org	2008-12-12 18:45:58

Modified files:
	libdm          : libdm-deptree.c 

Log message:
	Use dm_snprintf to avoid duplicating the snprintf compatibility code.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-deptree.c.diff?cvsroot=lvm2&r1=1.48&r2=1.49

--- LVM2/libdm/libdm-deptree.c	2008/12/11 16:25:51	1.48
+++ LVM2/libdm/libdm-deptree.c	2008/12/12 18:45:58	1.49
@@ -1224,17 +1224,14 @@
 
 /* simplify string emiting code */
 #define EMIT_PARAMS(p, str...)\
-	do {\
-		const size_t bufsize = paramsize - (size_t)p;\
-		int w;\
-		\
-		if ((w = snprintf(params + p, bufsize, str)) < 0\
-		    || ((size_t)w >= bufsize)) {\
-			stack; /* Out of space */\
-			return -1;\
-		}\
-		p += w;\
-	} while (0)
+do {\
+	int w;\
+	if ((w = dm_snprintf(params + p, paramsize - (size_t) p, str)) < 0) {\
+		stack; /* Out of space */\
+		return -1;\
+	}\
+	p += w;\
+} while (0)
 
 static int _emit_areas_line(struct dm_task *dmt __attribute((unused)),
 			    struct load_segment *seg, char *params,