[SCM] libgnokii and core programs branch, master, updated. rel_0_6_29-546-gd73df35

[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  d73df3554452eb14325f625b6a70133f94c1a8f7 (commit)
      from  d18213af6ec2926af499fe901a17d8ad26af06df (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=d73df3554452eb14325f625b6a70133f94c1a8f7


commit d73df3554452eb14325f625b6a70133f94c1a8f7
Author: Daniele Forsi <address@hidden>
Date:   Tue Jan 7 18:35:57 2014 +0100

    Close the file also when the format is unsupported
    
    However the default case of the switch statement is never executed
    because the default type is GN_FT_RTTTL.

diff --git a/common/gsm-filetypes.c b/common/gsm-filetypes.c
index 1d922dc..ea221bf 100644
--- a/common/gsm-filetypes.c
+++ b/common/gsm-filetypes.c
@@ -108,25 +108,21 @@ gn_error gn_file_ringtone_read(char *filename, 
gn_ringtone *ringtone)
        switch (filetype) {
        case GN_FT_RTTTL:
                error = file_rtttl_load(file, ringtone);
-               fclose(file);
                break;
        case GN_FT_OTT:
                error = file_ott_load(file, ringtone);
-               fclose(file);
                break;
        case GN_FT_MIDI:
                error = file_midi_load(file, ringtone);
-               fclose(file);
                break;
        case GN_FT_NOKRAW_TONE:
                error = file_nokraw_load(file, ringtone);
-               fclose(file);
                break;
        default:
                error = GN_ERR_WRONGDATAFORMAT;
                break;
        }
-
+       fclose(file);
        return error;
 }
 

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

Summary of changes:
 common/gsm-filetypes.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
libgnokii and core programs