[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-493-ge773c98

[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  e773c984579f759644e339678d90fdfa3aae6491 (commit)
      from  dbe86abefa7bb872da52799d8fc2665cd9f24700 (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=e773c984579f759644e339678d90fdfa3aae6491


commit e773c984579f759644e339678d90fdfa3aae6491
Author: Daniele Forsi <address@hidden>
Date:   Fri Apr 26 10:12:34 2013 +0200

    Revert "Fix --writephonebook returning an error at EOF"
    
    This reverts commit dbe86abefa7bb872da52799d8fc2665cd9f24700.
    Committed by mistake with Wrong comment.

diff --git a/common/vcard.c b/common/vcard.c
index 6cc2abb..91c1221 100644
--- a/common/vcard.c
+++ b/common/vcard.c
@@ -352,15 +352,13 @@ GNOKII_API int gn_vcard2phonebook(FILE *f, 
gn_phonebook_entry *entry)
        }
        str_append_printf(&str, buf);
 
-       retval = -1;
        while (fgets(buf, 1024, f)) {
                str_append_printf(&str, buf);
-               if (BEGINS("END:VCARD")) {
-                       retval = gn_vcardstr2phonebook(str.str, entry);
+               if (BEGINS("END:VCARD"))
                        break;
-               }
        }
 
+       retval = gn_vcardstr2phonebook(str.str, entry);
        free(str.str);
 
        return retval;

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

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


hooks/post-receive
-- 
libgnokii and core programs