diff options
| author | Seth Alves <alves@src.gnome.org> | 2000-02-21 21:19:28 +0800 |
|---|---|---|
| committer | Seth Alves <alves@src.gnome.org> | 2000-02-21 21:19:28 +0800 |
| commit | c2e1263462c84bfae59a3f296758296ac3a10a67 (patch) | |
| tree | 56965c52067222cac0199e2a09d33ef93b0dcb4d /libical/src/libicalss | |
| parent | c69d6adfcd4b6ef04cae78c87f2328b8debb13bb (diff) | |
| download | gsoc2013-evolution-c2e1263462c84bfae59a3f296758296ac3a10a67.tar gsoc2013-evolution-c2e1263462c84bfae59a3f296758296ac3a10a67.tar.gz gsoc2013-evolution-c2e1263462c84bfae59a3f296758296ac3a10a67.tar.bz2 gsoc2013-evolution-c2e1263462c84bfae59a3f296758296ac3a10a67.tar.lz gsoc2013-evolution-c2e1263462c84bfae59a3f296758296ac3a10a67.tar.xz gsoc2013-evolution-c2e1263462c84bfae59a3f296758296ac3a10a67.tar.zst gsoc2013-evolution-c2e1263462c84bfae59a3f296758296ac3a10a67.zip | |
This commit was generated by cvs2svn to compensate for changes in r1879,
which included commits to RCS files with non-trunk default branches.
svn path=/trunk/; revision=1880
Diffstat (limited to 'libical/src/libicalss')
| -rw-r--r-- | libical/src/libicalss/icalcluster.c | 1 | ||||
| -rw-r--r-- | libical/src/libicalss/icalstore.c | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libical/src/libicalss/icalcluster.c b/libical/src/libicalss/icalcluster.c index 00e7ef0365..c0160cc6c3 100644 --- a/libical/src/libicalss/icalcluster.c +++ b/libical/src/libicalss/icalcluster.c @@ -67,7 +67,6 @@ icalerrorenum icalcluster_create_cluster(char *path) f = fopen(path,"w"); if (f == 0){ - fclose(f); icalerror_set_errno(ICAL_FILE_ERROR); return ICAL_FILE_ERROR; } diff --git a/libical/src/libicalss/icalstore.c b/libical/src/libicalss/icalstore.c index 014c9ed19b..5d1546f3b2 100644 --- a/libical/src/libicalss/icalstore.c +++ b/libical/src/libicalss/icalstore.c @@ -206,11 +206,13 @@ void icalstore_free(icalstore* s) icalcluster_free(impl->cluster); } - while( (str=pvl_pop(impl->directory)) != 0){ + while(impl->directory !=0 && (str=pvl_pop(impl->directory)) != 0){ free(str); } - pvl_free(impl->directory); + if(impl->directory != 0){ + pvl_free(impl->directory); + } impl->directory = 0; impl->directory_iterator = 0; |