From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3667-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 24379 invoked by alias); 23 Nov 2010 15:00:54 -0000
Received: (qmail 24359 invoked by uid 9737); 23 Nov 2010 15:00:53 -0000
Date: Tue, 23 Nov 2010 15:00:00 -0000
Message-ID: <20101123150053.24357.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/libdm libdm-string.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: 2010-11/txt/msg00042.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2010-11-23 15:00:52

Modified files:
	libdm          : libdm-string.c 

Log message:
	Move va_end(ap)  so we do not leave with return -1 without calling it.
	Remove unneeded ';'

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/libdm/libdm-string.c.diff?cvsroot=lvm2&r1=1.13&r2=1.14

--- LVM2/libdm/libdm-string.c	2010/10/25 13:13:53	1.13
+++ LVM2/libdm/libdm-string.c	2010/11/23 15:00:52	1.14
@@ -144,6 +144,8 @@
 	while (!ok) {
 		va_start(ap, format);
 		n = vsnprintf(buf, size, format, ap);
+		va_end(ap);
+
 		if (0 <= n && n < size)
 			ok = 1;
 		else {
@@ -152,8 +154,7 @@
 			buf = dm_malloc(size);
 			if (!buf)
 				return -1;
-		};
-		va_end(ap);
+		}
 	}
 
 	*result = dm_strdup(buf);