From ecc61e2fb16762389f70bb30622950b3a9c466d3 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Sun, 19 Oct 2008 09:10:44 +0000
Subject: [PATCH] Further simplify the code.

Submitted by:	Christoph Mallon <christoph.mallon gmx.de>
---
 lib/libc/string/strxfrm.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/lib/libc/string/strxfrm.c b/lib/libc/string/strxfrm.c
index cce6c0f531a..a4c8019468d 100644
--- a/lib/libc/string/strxfrm.c
+++ b/lib/libc/string/strxfrm.c
@@ -45,17 +45,8 @@ strxfrm(char * __restrict dest, const char * __restrict src, size_t len)
 		return 0;
 	}
 
-	if (__collate_load_error) {
-		slen = strlen(src);
-		if (len > 0) {
-			if (slen < len)
-				strcpy(dest, src);
-			else {
-				strlcpy(dest, src, len);
-			}
-		}
-		return slen;
-	}
+	if (__collate_load_error)
+		return strlcpy(dest, src, len);
 
 	slen = 0;
 	prim = sec = 0;