[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-503-g87eac94

[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  87eac94df483b2f1084d2d7a9f9c252fa6b2c100 (commit)
      from  b12b27756e6e0919a47262d91c58130bb4feb6ec (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=87eac94df483b2f1084d2d7a9f9c252fa6b2c100


commit 87eac94df483b2f1084d2d7a9f9c252fa6b2c100
Author: Daniele Forsi <address@hidden>
Date:   Sun Apr 28 19:29:01 2013 +0200

    Make messages for unhandled frames consistent
    
    Only for debug messages related to message[4]: print function name so
    it's easier to find the place to fix and always print hex numbers with
    an "0x" prefix to avoid ambiguity.

diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index 7892e36..78333d5 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -916,7 +916,7 @@ static gn_error NK6510_IncomingFolder(int messagetype, 
unsigned char *message, i
                        dprintf("SMS saving failed: Incorrect folder\n");
                        return GN_ERR_INVALIDMEMORYTYPE;
                default:
-                       dprintf("ERROR: unknown (%02x)\n",message[4]);
+                       dprintf("%s: Unknown sub-subtype 0x%02x\n", 
__FUNCTION__, message[4]);
                        return GN_ERR_UNHANDLEDFRAME;
                }
                break;
@@ -962,7 +962,7 @@ static gn_error NK6510_IncomingFolder(int messagetype, 
unsigned char *message, i
                        dprintf("SMS saving failed: Incorrect folder\n");
                        return GN_ERR_INVALIDLOCATION;
                default:
-                       dprintf("ERROR: unknown %i\n",message[4]);
+                       dprintf("%s: Unknown sub-subtype 0x%02x\n", 
__FUNCTION__, message[4]);
                        return GN_ERR_UNHANDLEDFRAME;
                }
                break;
@@ -974,7 +974,7 @@ static gn_error NK6510_IncomingFolder(int messagetype, 
unsigned char *message, i
                        dprintf("Invalid location\n");
                        return GN_ERR_INVALIDLOCATION;
                default:
-                       dprintf("Unknown reason.\n");
+                       dprintf("%s: Unknown sub-subtype 0x%02x\n", 
__FUNCTION__, message[4]);
                        return GN_ERR_UNHANDLEDFRAME;
                }
 
@@ -1064,6 +1064,7 @@ static gn_error NK6510_IncomingFolder(int messagetype, 
unsigned char *message, i
                        break;
                default:
                        dprintf("Failed to create SMS Folder! Reason unknown 
(%02x)!\n", message[4]);
+                       dprintf("%s: Unknown sub-subtype 0x%02x\n", 
__FUNCTION__, message[4]);
                        return GN_ERR_UNKNOWN;
                        break;
                }
@@ -1113,6 +1114,7 @@ static gn_error NK6510_IncomingFolder(int messagetype, 
unsigned char *message, i
                        return GN_ERR_FAILED;
                default:
                        dprintf("SMS Folder could not be deleted! Reason 
unknown (%02x)\n", message[4]);
+                       dprintf("%s: Unknown sub-subtype 0x%02x\n", 
__FUNCTION__, message[4]);
                        return GN_ERR_FAILED;
                }
                break;
@@ -1871,7 +1873,7 @@ err:
                        e = GN_ERR_EMPTYLOCATION;
                        break;
                default:
-                       dprintf("Unknown response subtype: %02x\n", message[4]);
+                       dprintf("%s: Unknown sub-subtype 0x%02x\n", 
__FUNCTION__, message[4]);
                        e = GN_ERR_UNHANDLEDFRAME;
                        break;
                }
@@ -2532,8 +2534,8 @@ static gn_error NK6510_IncomingFile(int messagetype, 
unsigned char *message, int
                case 0x01: /* OK */
                        break;
                default:
+                       dprintf("%s: Unknown sub-subtype 0x%02x\n", 
__FUNCTION__, message[4]);
                        error = GN_ERR_UNKNOWN;
-                       dprintf("error!\n");
                        goto out;
                }
                if (!data->file) {
@@ -4589,6 +4591,7 @@ static gn_error NK6510_IncomingRingtone(int messagetype, 
unsigned char *message,
                        dprintf("Ringtone too long. Max is 69 notes.\n");
                        return GN_ERR_ENTRYTOOLONG;
                default:
+                       dprintf("%s: Unknown sub-subtype 0x%02x\n", 
__FUNCTION__, message[4]);
                        return GN_ERR_UNHANDLEDFRAME;
                }
                break;

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

Summary of changes:
 common/phones/nk6510.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs