[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-221-g94d7288

[Pawel Kot]

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  94d728869ea7ed27d9fc087f1d0d48ed0c0b5db6 (commit)
       via  0613b277895a8bbb89fd97e35d437388ceea7497 (commit)
      from  77a010ac46ab9cba1fb3ca7d6720a68f5a374e9d (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=94d728869ea7ed27d9fc087f1d0d48ed0c0b5db6


commit 94d728869ea7ed27d9fc087f1d0d48ed0c0b5db6
Author: Pawel Kot <address@hidden>
Date:   Fri May 13 21:44:58 2011 +0200

    Rename:
     type to smsc_type
     number to smsc_number
    to be more explanatory as per Jan Derfinak request.

diff --git a/smsd/lowlevel.c b/smsd/lowlevel.c
index c814475..874d502 100644
--- a/smsd/lowlevel.c
+++ b/smsd/lowlevel.c
@@ -256,31 +256,31 @@ static gint A_SendSMSMessage (gpointer data)
   if (!d->sms->smsc.number[0])
   {
     /* keep the local cache of smsc information, it doesn't change too often */
-    static gn_gsm_number_type type = -1; /* -1: unititialized, -2: 
GetSMSCenter does not work */
-    static char number[GN_BCD_STRING_MAX_LENGTH];
+    static gn_gsm_number_type smsc_type = -1; /* -1: unititialized, -2: 
GetSMSCenter does not work */
+    static char smsc_number[GN_BCD_STRING_MAX_LENGTH];
 
-    if (type == -2)
+    if (smsc_type == -2)
       status = GN_ERR_FAILED;
     else
       status = GN_ERR_NONE;
 
-    if (type == -1)
+    if (smsc_type == -1)
     {
       dt->message_center = calloc (1, sizeof (gn_sms_message_center));
       dt->message_center->id = 1;
       if ((status = gn_sm_functions (GN_OP_GetSMSCenter, dt, sm)) == 
GN_ERR_NONE)
       {
-        strcpy (number, dt->message_center->smsc.number);
-        type = dt->message_center->smsc.type;
+        strcpy (smsc_number, dt->message_center->smsc.number);
+        smsc_type = dt->message_center->smsc.type;
       } else {
-        type = -2;
+        smsc_type = -2;
       }
       free (dt->message_center);
     }
     if (status == GN_ERR_NONE)
     {
-        strcpy (d->sms->smsc.number, number);
-        d->sms->smsc.type = type;
+        strcpy (d->sms->smsc.number, smsc_number);
+        d->sms->smsc.type = smsc_type;
     }
   }
   

http://git.savannah.gnu.org/cgit/gnokii.git/commit/?id=0613b277895a8bbb89fd97e35d437388ceea7497


commit 94d728869ea7ed27d9fc087f1d0d48ed0c0b5db6
Author: Pawel Kot <address@hidden>
Date:   Fri May 13 21:44:58 2011 +0200

    Rename:
     type to smsc_type
     number to smsc_number
    to be more explanatory as per Jan Derfinak request.

diff --git a/smsd/lowlevel.c b/smsd/lowlevel.c
index c814475..874d502 100644
--- a/smsd/lowlevel.c
+++ b/smsd/lowlevel.c
@@ -256,31 +256,31 @@ static gint A_SendSMSMessage (gpointer data)
   if (!d->sms->smsc.number[0])
   {
     /* keep the local cache of smsc information, it doesn't change too often */
-    static gn_gsm_number_type type = -1; /* -1: unititialized, -2: 
GetSMSCenter does not work */
-    static char number[GN_BCD_STRING_MAX_LENGTH];
+    static gn_gsm_number_type smsc_type = -1; /* -1: unititialized, -2: 
GetSMSCenter does not work */
+    static char smsc_number[GN_BCD_STRING_MAX_LENGTH];
 
-    if (type == -2)
+    if (smsc_type == -2)
       status = GN_ERR_FAILED;
     else
       status = GN_ERR_NONE;
 
-    if (type == -1)
+    if (smsc_type == -1)
     {
       dt->message_center = calloc (1, sizeof (gn_sms_message_center));
       dt->message_center->id = 1;
       if ((status = gn_sm_functions (GN_OP_GetSMSCenter, dt, sm)) == 
GN_ERR_NONE)
       {
-        strcpy (number, dt->message_center->smsc.number);
-        type = dt->message_center->smsc.type;
+        strcpy (smsc_number, dt->message_center->smsc.number);
+        smsc_type = dt->message_center->smsc.type;
       } else {
-        type = -2;
+        smsc_type = -2;
       }
       free (dt->message_center);
     }
     if (status == GN_ERR_NONE)
     {
-        strcpy (d->sms->smsc.number, number);
-        d->sms->smsc.type = type;
+        strcpy (d->sms->smsc.number, smsc_number);
+        d->sms->smsc.type = smsc_type;
     }
   }
   

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

Summary of changes:
 ChangeLog       |    2 ++
 smsd/ChangeLog  |    4 ++++
 smsd/lowlevel.c |   31 +++++++++++++++++++++++++------
 3 files changed, 31 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs