[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-536-g6df542d

[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  6df542d0c6c43a81152b925ac7b32d8fdea6b1cf (commit)
      from  82d6c6a1bb38ec94f84eb8f6268e09bb1f459a0d (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=6df542d0c6c43a81152b925ac7b32d8fdea6b1cf


commit 6df542d0c6c43a81152b925ac7b32d8fdea6b1cf
Author: Daniele Forsi <address@hidden>
Date:   Wed Jan 1 13:40:50 2014 +0100

    Trivial whitespace fixes
    
    To see if only whitespace has been modified, use:
    git log --patch --ignore-all-space

diff --git a/common/compat.c b/common/compat.c
index 5aa1bc5..c319c9e 100644
--- a/common/compat.c
+++ b/common/compat.c
@@ -65,7 +65,7 @@ int unsetenv(const char *name)
        return setenv(name, "", 1);
 }
 #endif
-                  
+
 #ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
 #endif
diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c
index 08efa36..1d922dc 100644
--- a/common/gsm-filetypes.c
+++ b/common/gsm-filetypes.c
@@ -828,7 +828,7 @@ gn_error file_ngg_load(FILE *file, gn_bmp *bitmap, gn_phone 
*info)
 
        /* Some programs writes here fileinfo */
        if (fread(buffer, 1, 1, file) == 1) {
-               dprintf("Fileinfo: %c",buffer[0]);
+               dprintf("Fileinfo: %c",buffer[0]);
                while (fread(buffer, 1, 1, file) == 1) {
                        if (buffer[0] != 0x0A) dprintf("%c", buffer[0]);
                }
@@ -1248,10 +1248,10 @@ void file_nsl_save(FILE *file, gn_bmp *bitmap, gn_phone 
*info)
 
        gn_bmp_resize(bitmap, GN_BMP_StartupLogo, info);
 
-        header[4] = (bitmap->size + 6) / 256;
-        header[5] = (bitmap->size + 6) % 256;
-        header[10] = bitmap->size / 256;
-        header[11] = bitmap->size % 256;
+       header[4] = (bitmap->size + 6) / 256;
+       header[5] = (bitmap->size + 6) % 256;
+       header[10] = bitmap->size / 256;
+       header[11] = bitmap->size % 256;
        fwrite(header, 1, sizeof(header), file);
        
        fwrite(bitmap->bitmap, 1, bitmap->size, file);
diff --git a/common/libfunctions.c b/common/libfunctions.c
index 1c3d20b..888ff81 100644
--- a/common/libfunctions.c
+++ b/common/libfunctions.c
@@ -286,8 +286,8 @@ GNOKII_API gn_error gn_lib_addressbook_memstat( struct 
gn_statemachine *state,
 
        gn_data_clear(data);
        memset(&memstat, 0, sizeof(memstat));
-        memstat.memory_type = memory_type;
-        data->memory_status = &memstat;
+       memstat.memory_type = memory_type;
+       data->memory_status = &memstat;
 
        error = gn_sm_functions(GN_OP_GetMemoryStatus, data, state);
        if (error == GN_ERR_NONE) {
diff --git a/common/links/fbus.c b/common/links/fbus.c
index 69b2ceb..e77afcf 100644
--- a/common/links/fbus.c
+++ b/common/links/fbus.c
@@ -93,7 +93,7 @@ static int send_command(char *cmd, int len, struct 
gn_statemachine *state)
        /* Experimental timeout */
        timeout.tv_sec  = 0;
        timeout.tv_usec = 500000;
-        
+
        res = device_select(&timeout, state);
        /* Read from the port only when select succeeds */
        while (res > 0 && waitformore) {
diff --git a/common/phones/atgen.c b/common/phones/atgen.c
index 16043ab..4b61d61 100644
--- a/common/phones/atgen.c
+++ b/common/phones/atgen.c
@@ -1325,11 +1325,11 @@ static gn_error AT_GetSMSStatusInternal(gn_data *data, 
struct gn_statemachine *s
        if (!data->sms_status)
                return GN_ERR_INTERNALERROR;
 
-        if (data->memory_status) {
-                ret = AT_SetSMSMemoryType(data->memory_status->memory_type,  
state);
-                if (ret != GN_ERR_NONE)
-                        return ret;
-        }
+       if (data->memory_status) {
+               ret = AT_SetSMSMemoryType(data->memory_status->memory_type,  
state);
+               if (ret != GN_ERR_NONE)
+                       return ret;
+       }
 
        ret = sm_message_send(9, GN_OP_GetSMSStatus, "AT+CPMS?\r", state);
        if (ret != GN_ERR_NONE)
diff --git a/common/phones/nk6510.c b/common/phones/nk6510.c
index f67cdf3..2e3f5e6 100644
--- a/common/phones/nk6510.c
+++ b/common/phones/nk6510.c
@@ -314,7 +314,7 @@ static gn_incoming_function_type 
nk6510_incoming_functions[] = {
        { NK6510_MSG_CLOCK,     NK6510_IncomingClock },
        { NK6510_MSG_IDENTITY,  NK6510_IncomingIdentify },
        { NK6510_MSG_STLOGO,    NK6510_IncomingStartup },
-       { NK6510_MSG_PROFILE,    NK6510_IncomingProfile },
+       { NK6510_MSG_PROFILE,   NK6510_IncomingProfile },
        { NK6510_MSG_RINGTONE,  NK6510_IncomingRingtone },
        { NK6510_MSG_KEYPRESS,  NK6510_IncomingKeypress },
        { NK6510_MSG_SECURITY,  NK6510_IncomingSecurity },
@@ -324,7 +324,7 @@ static gn_incoming_function_type 
nk6510_incoming_functions[] = {
        { NK6510_MSG_TODO,      NK6510_IncomingToDo },
        { NK6510_MSG_SOUND,     NK6510_IncomingSound },
        { NK6510_MSG_RADIO,     NK6510_IncomingRadio },
-       { NK6510_MSG_FILE,      NK6510_IncomingFile },
+       { NK6510_MSG_FILE,      NK6510_IncomingFile },
        { 0, NULL }
 };
 
@@ -1919,8 +1919,8 @@ err:
                                break;
                        case 0x81: /* SMSC name */
                                char_unicode_decode(data->message_center->name,
-                                             message + offset + 4,
-                                             message[offset + 2]);
+                                                   message + offset + 4,
+                                                   message[offset + 2]);
                                data->message_center->default_name = -1;
                                break;
                        default:
@@ -2280,7 +2280,7 @@ static gn_error NK6510_GetFile(gn_data *data, struct 
gn_statemachine *state)
        unsigned char req2[512] = {FBUS_FRAME_HEADER, 0x72, 0x00, 0x00, 0x00};
        unsigned char req3[] = {FBUS_FRAME_HEADER, 0x5e, 0x00, 0x00, 0x00, 
0x00, 0x00, 0x03,
                                0x00, 0x00, 0x00, 0x00, /* Start position */
-                               0x00, 0x00, 0x04, 0x00,
+                               0x00, 0x00, 0x04, 0x00,
                                0x00, 0x00, 0x00, 0x00}; /* Size */
        unsigned char req4[] = {FBUS_FRAME_HEADER, 0x74, 0x00, 0x00, 0x00, 
0x00, 0x00, 0x03};
        gn_error err;
@@ -2444,7 +2444,7 @@ static gn_error NK6510_PutFile(gn_data *data, struct 
gn_statemachine *state)
 
        /* Put the data */
        while (data->file->togo > 0) {
-               memcpy(req2+4, data->file->id, NK6510_FILE_ID_LENGTH);
+               memcpy(req2+4, data->file->id, NK6510_FILE_ID_LENGTH);
                i = data->file->togo;
                if (data->file->togo > 0x100) {
                        req2[12] = 0x01;
@@ -2684,7 +2684,7 @@ static gn_error NK6510_IncomingFile(int messagetype, 
unsigned char *message, int
                        goto out;
                }
                if (data->file) {
-                       int i;
+                       int i;
                        if (message[4] == 0x0c) {
                                data->file->togo = -1;
                        } else if (message[4] == 0x00) {
@@ -2693,7 +2693,7 @@ static gn_error NK6510_IncomingFile(int messagetype, 
unsigned char *message, int
 
                        data->file->id = calloc(NK6510_FILE_ID_LENGTH+1, 
sizeof(char));
                        for (i = 0; i < NK6510_FILE_ID_LENGTH; i++) {
-                               data->file->id[i] = message[4 + i];
+                               data->file->id[i] = message[4 + i];
                        }
                }
                break;
@@ -3089,7 +3089,7 @@ retry:
                                        if (entry->subentries[i].entry_type == 
entry->subentries[j].entry_type &&
                                            entry->subentries[i].number_type == 
entry->subentries[j].number_type &&
                                            
!strcmp(entry->subentries[i].data.number, entry->subentries[j].data.number)) {
-                                               dprintf("duplicate 
subentry!\n");
+                                               dprintf("duplicate 
subentry!\n");
                                                duplicate = 1;
                                                break;
                                        }
@@ -3302,7 +3302,7 @@ static gn_error NK6510_SetDateTime(gn_data *data, struct 
gn_statemachine *state)
        unsigned char req[] = {FBUS_FRAME_HEADER, 0x01, 0x00, 0x01,
                               0x01, 0x0c, 0x01, 0x03,
                               0x07, 0xd2,      /* Year */
-                              0x08, 0x01,     /* Month & Day */
+                              0x08, 0x01,      /* Month & Day */
                               0x15, 0x1f,      /* Hours & Minutes */
                               0x00,            /* Seconds */
                               0x00};
@@ -4812,7 +4812,7 @@ static gn_error SetStartupBitmap(gn_data *data, struct 
gn_statemachine *state)
                        state->driver.phone.startup_logo_height, 
state->driver.phone.startup_logo_width,
                        data->bitmap->height, data->bitmap->width);
 
-           return GN_ERR_INVALIDSIZE;
+               return GN_ERR_INVALIDSIZE;
        }
 
        req[12] = data->bitmap->height;
@@ -5367,7 +5367,7 @@ static gn_error NK6510_IncomingReset(int messagetype, 
unsigned char *message, in
 
 static gn_error NK6510_Reset(gn_data *data, struct gn_statemachine *state)
 {
-       unsigned char req[] = {FBUS_FRAME_HEADER,0x05,0x80,0x00};
+       unsigned char req[] = {FBUS_FRAME_HEADER,0x05,0x80,0x00};
        unsigned char req2[] = {FBUS_FRAME_HEADER,0x01,0,0,0,0,0,0x01};
 
        if (data->reset_type == 0x03) {
@@ -6790,11 +6790,11 @@ static int sms_encode(gn_data *data, struct 
gn_statemachine *state, unsigned cha
        } else {
                req[pos] = 0x01; /* SMS Submit */
 
-               if (data->raw_sms->reply_via_same_smsc)  req[pos] |= 0x80;
-               if (data->raw_sms->reject_duplicates)  req[pos] |= 0x04;
-               if (data->raw_sms->report)            req[pos] |= 0x20;
-               if (data->raw_sms->udh_indicator)      req[pos] |= 0x40;
-               if (data->raw_sms->validity_indicator) req[pos] |= 0x10;
+               if (data->raw_sms->reply_via_same_smsc) req[pos] |= 0x80;
+               if (data->raw_sms->reject_duplicates)   req[pos] |= 0x04;
+               if (data->raw_sms->report)              req[pos] |= 0x20;
+               if (data->raw_sms->udh_indicator)       req[pos] |= 0x40;
+               if (data->raw_sms->validity_indicator)  req[pos] |= 0x10;
                pos++;
                req[pos++] = data->raw_sms->reference;
                req[pos++] = data->raw_sms->pid;
diff --git a/common/vcard.c b/common/vcard.c
index 6cc2abb..5dbbf6e 100644
--- a/common/vcard.c
+++ b/common/vcard.c
@@ -501,7 +501,7 @@ GNOKII_API int gn_vcardstr2phonebook(const char *vcard, 
gn_phonebook_entry *entr
                        entry->subentries[entry->subentries_count].data.id = 
atoi(buf + strlen("X-GSM-CALLERGROUPID:"));
                        entry->subentries[entry->subentries_count].entry_type = 
GN_PHONEBOOK_ENTRY_ExtGroup;
                        entry->subentries_count++;
-                       continue;
+                       continue;
                }
 
                if (BEGINS("END:VCARD"))
diff --git a/include/data/at-emulator.h b/include/data/at-emulator.h
index 949b074..0b51269 100644
--- a/include/data/at-emulator.h
+++ b/include/data/at-emulator.h
@@ -40,7 +40,7 @@ extern struct gn_statemachine *sm;
 extern gn_data         data;
 
        /* Definition of modem result codes - these are returned to "terminal"
-       numerically or as a string depending on the setting of S12 */
+          numerically or as a string depending on the setting of S12 */
 
        /* FIX ME - Numeric values for everything except OK and ERROR
           are guesses as I've not got an AT reference handy.   HAB */

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

Summary of changes:
 common/compat.c            |    2 +-
 common/gsm-filetypes.c     |   10 +++++-----
 common/libfunctions.c      |    4 ++--
 common/links/fbus.c        |    2 +-
 common/phones/atgen.c      |   10 +++++-----
 common/phones/nk6510.c     |   34 +++++++++++++++++-----------------
 common/vcard.c             |    2 +-
 include/data/at-emulator.h |    2 +-
 8 files changed, 33 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs