From owner-svn-src-head@FreeBSD.ORG  Tue Feb 25 00:57:07 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 49854322;
 Tue, 25 Feb 2014 00:57:07 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 32AE11B18;
 Tue, 25 Feb 2014 00:57:07 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1P0v7P3011875;
 Tue, 25 Feb 2014 00:57:07 GMT (envelope-from delphij@svn.freebsd.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1P0v7Ku011874;
 Tue, 25 Feb 2014 00:57:07 GMT (envelope-from delphij@svn.freebsd.org)
Message-Id: <201402250057.s1P0v7Ku011874@svn.freebsd.org>
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 25 Feb 2014 00:57:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262463 - head/lib/libiconv_modules/VIQR
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Feb 2014 00:57:07 -0000

Author: delphij
Date: Tue Feb 25 00:57:06 2014
New Revision: 262463
URL: http://svnweb.freebsd.org/changeset/base/262463

Log:
  Revert 262462 and 262461, they didn't solve the problem, in
  fact I should actually waited the build to be finished before
  committing.
  
  A proper fix would be committed once my test build passes.
  
  Pointy hat to:	delphij

Modified:
  head/lib/libiconv_modules/VIQR/citrus_viqr.c

Modified: head/lib/libiconv_modules/VIQR/citrus_viqr.c
==============================================================================
--- head/lib/libiconv_modules/VIQR/citrus_viqr.c	Mon Feb 24 23:58:07 2014	(r262462)
+++ head/lib/libiconv_modules/VIQR/citrus_viqr.c	Tue Feb 25 00:57:06 2014	(r262463)
@@ -457,18 +457,16 @@ _citrus_VIQR_encoding_module_init(_VIQRE
 			return (errnum);
 		}
 	}
-	if (mnemonic_ext > 0) {
-		for (i = 0; i < mnemonic_ext_size; ++i) {
-			p = &mnemonic_ext[i];
-			n = strlen(p->name);
-			if (ei->mb_cur_max < n)
-				ei->mb_cur_max = n;
-			errnum = mnemonic_append_child(ei->mroot,
-			    p->name, p->value, ei->invalid);
-			if (errnum != 0) {
-				_citrus_VIQR_encoding_module_uninit(ei);
-				return (errnum);
-			}
+	for (i = 0; i < mnemonic_ext_size; ++i) {
+		p = &mnemonic_ext[i];
+		n = strlen(p->name);
+		if (ei->mb_cur_max < n)
+			ei->mb_cur_max = n;
+		errnum = mnemonic_append_child(ei->mroot,
+		    p->name, p->value, ei->invalid);
+		if (errnum != 0) {
+			_citrus_VIQR_encoding_module_uninit(ei);
+			return (errnum);
 		}
 	}