[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-413-g2450a4f

[Daniele Forsi]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "libgnokii and core programs".

The branch, master has been updated
       via  2450a4fa8d8dd5057948cbd724e62f90307b70f8 (commit)
      from  d1bfc6bc7dbb8077ea422a2df8b452e310b8b360 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=2450a4fa8d8dd5057948cbd724e62f90307b70f8


commit 2450a4fa8d8dd5057948cbd724e62f90307b70f8
Author: Daniele Forsi <address@hidden>
Date:   Thu Nov 8 11:09:21 2012 +0100

    The mbs variable is needed only when HAVE_ICONV isn't defined

diff --git a/common/gsm-encoding.c b/common/gsm-encoding.c
index cd570ae..627854c 100644
--- a/common/gsm-encoding.c
+++ b/common/gsm-encoding.c
@@ -977,16 +977,16 @@ unsigned int char_unicode_decode(unsigned char* dest, 
const unsigned char* src,
 unsigned int char_unicode_encode(unsigned char* dest, const unsigned char* 
src, int len)
 {
        int pos = 0;
-       MBSTATE mbs;
 #ifndef HAVE_ICONV
+       MBSTATE mbs;
        int length, offset = 0;
        wchar_t  wc;
 #endif
 
-       MBSTATE_ENC_CLEAR(mbs);
 #ifdef HAVE_ICONV
        pos = ucs2_encode(dest, 2 * len, src, len);
 #else
+       MBSTATE_ENC_CLEAR(mbs);
        while (offset < len) {
                length = char_uni_alphabet_encode(src + offset, len - offset, 
&wc, &mbs);
                switch (length) {

-----------------------------------------------------------------------

Summary of changes:
 common/gsm-encoding.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs