[SCM] libgnokii and core programs branch, master, updated. rel_0_6_28-200-g7ffa43f

[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  7ffa43febb6e0d4c45c6d2614baaf1446e2d7f4a (commit)
      from  a03362fc38f9c3c738b3349fe9605beaa7e08c8f (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=7ffa43febb6e0d4c45c6d2614baaf1446e2d7f4a


commit 7ffa43febb6e0d4c45c6d2614baaf1446e2d7f4a
Author: Daniele Forsi <address@hidden>
Date:   Mon Apr 12 12:38:34 2010 +0200

    Fix endianness bugs that made all SMS text to be detected as UCS2
    
    Also swap char_def_alphabet() and char_def_alphabet_ext() in the
    if clause to take advantage of shortcut evaluation.

diff --git a/common/gsm-encoding.c b/common/gsm-encoding.c
index e2ab491..b99440b 100644
--- a/common/gsm-encoding.c
+++ b/common/gsm-encoding.c
@@ -496,8 +496,8 @@ GNOKII_API int gn_char_def_alphabet(unsigned char *string)
                 *  - check in the default alphabet table
                 *  - check in the extended default alphabet table
                 */
-               if (!char_def_alphabet_ext(a + 256 * b) &&
-                   !char_def_alphabet(a + 256 * b)) {
+               if (!char_def_alphabet(256 * a + b) &&
+                   !char_def_alphabet_ext(256 * a + b)) {
                        free(ucs2str);
                        return false;
                }
@@ -644,7 +644,7 @@ int char_7bit_pack(unsigned int offset, unsigned char 
*input,
                bool double_char = false;
                unsigned int a = 0xff & ucs2str[2 * i], b = 0xff & ucs2str[2 * 
i + 1];
 
-               in_num = a + 256 * b;
+               in_num = 256 * a + b;
 
                if (char_def_alphabet_ext(in_num)) {
                        byte = GN_CHAR_UNI_ESCAPE;

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

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


hooks/post-receive
-- 
libgnokii and core programs