[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-479-ga38fc87

[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  a38fc8701808c7459b29e18903f05e50abd36683 (commit)
      from  c19d5664cc0d32b548896f5611f516289c8edc38 (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=a38fc8701808c7459b29e18903f05e50abd36683


commit a38fc8701808c7459b29e18903f05e50abd36683
Author: Daniele Forsi <address@hidden>
Date:   Sat Apr 20 14:50:26 2013 +0200

    Rename STORENUM macro as STORESUBNUM
    
    For consistency because it stores the number in a subentry and in
    preparation for the next commit.

diff --git a/common/vcard.c b/common/vcard.c
index a1887de..4998e2e 100644
--- a/common/vcard.c
+++ b/common/vcard.c
@@ -295,7 +295,7 @@ GNOKII_API int gn_phonebook2vcard(FILE *f, 
gn_phonebook_entry *entry, char *loca
 #define STORESUB(a, c) if (entry->subentries_count == 
GN_PHONEBOOK_SUBENTRIES_MAX_NUMBER) return -1; \
                                STORE2(a, 
entry->subentries[entry->subentries_count++].data.number, \
                                
entry->subentries[entry->subentries_count].entry_type = c);
-#define STORENUM(a, c) if (entry->subentries_count == 
GN_PHONEBOOK_SUBENTRIES_MAX_NUMBER) return -1; \
+#define STORESUBNUM(a, c) if (entry->subentries_count == 
GN_PHONEBOOK_SUBENTRIES_MAX_NUMBER) return -1; \
                                STORE2(a, 
entry->subentries[entry->subentries_count++].data.number, \
                                
entry->subentries[entry->subentries_count].entry_type = 
GN_PHONEBOOK_ENTRY_Number; \
                                
entry->subentries[entry->subentries_count].number_type = c);
@@ -404,7 +404,7 @@ GNOKII_API int gn_vcardstr2phonebook(const char *vcard, 
gn_phonebook_entry *entr
                s = strstr(s + 1, "\n");
        }
 
-       /* FIXME on error STORESUB() and STORENUM() leak memory allocated by 
gnokii_strsplit() */
+       /* FIXME on error STORESUB() and STORESUBNUM() leak memory allocated by 
gnokii_strsplit() */
        lines = gnokii_strsplit(v, "\n", num_lines);
 
        for (i = 0; i < num_lines; i++) {
@@ -491,12 +491,12 @@ GNOKII_API int gn_vcardstr2phonebook(const char *vcard, 
gn_phonebook_entry *entr
                STOREINT("X-GSM-LOCATION:", entry->location);
                STOREINT("X-GSM-CALLERGROUP:", entry->caller_group);
 
-               STORENUM("TEL;TYPE=HOME:", GN_PHONEBOOK_NUMBER_Home);
-               STORENUM("TEL;TYPE=CELL:", GN_PHONEBOOK_NUMBER_Mobile);
-               STORENUM("TEL;TYPE=FAX:", GN_PHONEBOOK_NUMBER_Fax);
-               STORENUM("TEL;TYPE=WORK:", GN_PHONEBOOK_NUMBER_Work);
-               STORENUM("TEL;TYPE=PREF:", GN_PHONEBOOK_NUMBER_General);
-               STORENUM("TEL;TYPE=VOICE:", GN_PHONEBOOK_NUMBER_Common);
+               STORESUBNUM("TEL;TYPE=HOME:", GN_PHONEBOOK_NUMBER_Home);
+               STORESUBNUM("TEL;TYPE=CELL:", GN_PHONEBOOK_NUMBER_Mobile);
+               STORESUBNUM("TEL;TYPE=FAX:", GN_PHONEBOOK_NUMBER_Fax);
+               STORESUBNUM("TEL;TYPE=WORK:", GN_PHONEBOOK_NUMBER_Work);
+               STORESUBNUM("TEL;TYPE=PREF:", GN_PHONEBOOK_NUMBER_General);
+               STORESUBNUM("TEL;TYPE=VOICE:", GN_PHONEBOOK_NUMBER_Common);
                if (BEGINS("X-GSM-CALLERGROUPID:")) {
                        entry->subentries[entry->subentries_count].data.id = 
atoi(buf + strlen("X-GSM-CALLERGROUPID:"));
                        entry->subentries[entry->subentries_count].entry_type = 
GN_PHONEBOOK_ENTRY_ExtGroup;

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

Summary of changes:
 common/vcard.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs