From 882e4d2b26d13ba4b3340d5696a9e2f2818228c7 Mon Sep 17 00:00:00 2001
From: Xin LI <delphij@FreeBSD.org>
Date: Tue, 25 Feb 2014 00:57:06 +0000
Subject: [PATCH] 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
---
 lib/libiconv_modules/VIQR/citrus_viqr.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/libiconv_modules/VIQR/citrus_viqr.c b/lib/libiconv_modules/VIQR/citrus_viqr.c
index 5c16f7ee1b45..0ae6214a0096 100644
--- a/lib/libiconv_modules/VIQR/citrus_viqr.c
+++ b/lib/libiconv_modules/VIQR/citrus_viqr.c
@@ -457,18 +457,16 @@ _citrus_VIQR_encoding_module_init(_VIQREncodingInfo * __restrict ei,
 			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);
 		}
 	}