From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lai Jiangshan Subject: [PATCH 2/5] libxl: simplify libxl__dirname() Date: Tue, 11 Mar 2014 22:15:22 +0800 Message-ID: <1394547325-18537-2-git-send-email-laijs@cn.fujitsu.com> References: <1394547325-18537-1-git-send-email-laijs@cn.fujitsu.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1394547325-18537-1-git-send-email-laijs@cn.fujitsu.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Keir Fraser , Ian Jackson , Ian Campbell , Lai Jiangshan List-Id: xen-devel@lists.xenproject.org Signed-off-by: Lai Jiangshan --- tools/libxl/libxl_internal.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c index 16b82b9..1db48b6 100644 --- a/tools/libxl/libxl_internal.c +++ b/tools/libxl/libxl_internal.c @@ -162,14 +162,12 @@ char *libxl__strndup(libxl__gc *gc, const char *c, size_t n) char *libxl__dirname(libxl__gc *gc, const char *s) { - char *c; - char *ptr = libxl__strdup(gc, s); + char *c = strrchr(s, '/'); - c = strrchr(ptr, '/'); if (!c) return NULL; - *c = '\0'; - return ptr; + + return libxl__strndup(gc, s, c - s); } void libxl__logv(libxl_ctx *ctx, xentoollog_level msglevel, int errnoval, -- 1.7.1