From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <lvm2-cvs-return-3874-listarch-lvm2-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 1471 invoked by alias); 28 Jan 2011 10:19:01 -0000
Received: (qmail 1454 invoked by uid 9737); 28 Jan 2011 10:19:00 -0000
Date: Fri, 28 Jan 2011 10:19:00 -0000
Message-ID: <20110128101900.1452.qmail@sourceware.org>
From: zkabelac@sourceware.org
To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org
Subject: LVM2/lib/config config.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: 2011-01/txt/msg00088.txt.bz2

CVSROOT:	/cvs/lvm2
Module name:	LVM2
Changes by:	zkabelac@sourceware.org	2011-01-28 10:19:00

Modified files:
	lib/config     : config.c 

Log message:
	Use memcpy and add error message
	
	strncpy (which check each byte for \0) is not need as we always copy
	the length size - so using memcpy is a bit cheaper.
	
	Add missing log_error message for failed allocation.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/config/config.c.diff?cvsroot=lvm2&r1=1.87&r2=1.88

--- LVM2/lib/config/config.c	2010/12/20 13:53:11	1.87
+++ LVM2/lib/config/config.c	2011/01/28 10:19:00	1.88
@@ -886,9 +886,11 @@
 {
 	size_t len = p->te - p->tb;
 	char *str = dm_pool_alloc(p->mem, len + 1);
-	if (!str)
-		return_0;
-	strncpy(str, p->tb, len);
+	if (!str) {
+		log_error("Failed to duplicate token.");
+		return 0;
+	}
+	memcpy(str, p->tb, len);
 	str[len] = '\0';
 	return str;
 }