[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-391-g5a87078

[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  5a87078af838afdd9a9c04bdadd38acc07a0f36b (commit)
      from  457c0be64e51d37b74e9c107738b1775f14f7aba (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=5a87078af838afdd9a9c04bdadd38acc07a0f36b


commit 5a87078af838afdd9a9c04bdadd38acc07a0f36b
Author: Daniele Forsi <address@hidden>
Date:   Sat Mar 24 12:22:22 2012 +0100

    Return GN_ERR_EMPTYLOCATION for all memories for error code 0x30
    
    Otherwise, except SM and ME, valid but empty memories would result in
    GN_ERR_INVALIDMEMORYTYPE.
    Tested on Nokia 5300, Nokia 8310 and Nokia 7110.

diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 654ba08..4275ae6 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -2756,22 +2756,7 @@ static gn_error NK6510_IncomingPhonebook(int 
messagetype, unsigned char *message
                if (message[6] == 0x0f) { /* not found */
                        switch (message[10]) {
                        case 0x30:
-                               if (data->phonebook_entry)
-                                       memtype = 
data->phonebook_entry->memory_type;
-                               else
-                                       memtype = GN_MT_XX;
-                               /*
-                                * this message has two meanings: "invalid
-                                * location" and "memory is empty"
-                                */
-                               switch (memtype) {
-                               case GN_MT_SM:
-                               case GN_MT_ME:
-                                       return GN_ERR_EMPTYLOCATION;
-                               default:
-                                       break;
-                               }
-                               return GN_ERR_INVALIDMEMORYTYPE;
+                               return GN_ERR_EMPTYLOCATION;
                        case 0x33:
                                return GN_ERR_EMPTYLOCATION;
                        case 0x34:
diff --git a/common/phones/nk7110.c b/common/phones/nk7110.c
index 2bd74a2..8ed278c 100644
--- a/common/phones/nk7110.c
+++ b/common/phones/nk7110.c
@@ -706,22 +706,7 @@ static gn_error NK7110_IncomingPhonebook(int messagetype, 
unsigned char *message
                                /* Phone is turned off */
                                return GN_ERR_NOTREADY;
                        case 0x30:
-                               if (data->phonebook_entry)
-                                       memtype_req = 
data->phonebook_entry->memory_type;
-                               else
-                                       memtype_req = GN_MT_XX;
-                               /*
-                                * this message has two meanings: "invalid
-                                * location" and "memory is empty"
-                                */
-                               switch (memtype_req) {
-                               case GN_MT_SM:
-                               case GN_MT_ME:
-                                       return GN_ERR_EMPTYLOCATION;
-                               default:
-                                       break;
-                               }
-                               return GN_ERR_INVALIDMEMORYTYPE;
+                               return GN_ERR_EMPTYLOCATION;
                        case 0x31:
                                return GN_ERR_INVALIDMEMORYTYPE;
                        case 0x33:

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

Summary of changes:
 common/phones/nk6510.c |   17 +----------------
 common/phones/nk7110.c |   17 +----------------
 2 files changed, 2 insertions(+), 32 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs