[Commits] [SCM] claws branch, master, updated. 3.10.1-85-ga5e54ec
Colin
colin at claws-mail.org
Thu Jun 19 07:53:58 CEST 2014
The branch master of project "claws" (Claws Mail) has been updated
via a5e54ecd2309a164ba8fa01e9a41f8b3e30193fe (commit)
via 820dd8afea1ef617a2a1c1ecb3a3994c34e0255d (commit)
via 314420a30cf9ac0ed03c7ba42320b4468dd352d7 (commit)
via d0883509611b7ca136f5c3c3c51a1acbcbc95181 (commit)
from 8e657679733be1aae2b85ecdf4badce23cfbd2e7 (commit)
Summary of changes:
src/plugins/archive/libarchive_archive.c | 16 ++++++-------
src/plugins/clamd/libclamd/clamd-plugin.c | 2 +-
src/plugins/mailmbox/mailmbox.c | 2 +-
.../gtkhotkey/gtk-hotkey-key-file-registry.c | 2 +-
src/plugins/rssyl/rssyl_update_format.c | 1 +
src/plugins/tnef_parse/ytnef.c | 6 +----
src/plugins/vcalendar/libical/libical/icalrecur.c | 25 +++++---------------
.../vcalendar/libical/libical/icalrestriction.c.in | 1 -
src/plugins/vcalendar/libical/libical/icalvalue.c | 3 ---
src/plugins/vcalendar/libical/libical/sspm.c | 7 ------
10 files changed, 19 insertions(+), 46 deletions(-)
- Log -----------------------------------------------------------------
commit a5e54ecd2309a164ba8fa01e9a41f8b3e30193fe
Author: Colin Leroy <colin at colino.net>
Date: Thu Jun 19 07:53:24 2014 +0200
Remove unused variables; patch by Christian Hesse
diff --git a/src/plugins/tnef_parse/ytnef.c b/src/plugins/tnef_parse/ytnef.c
index 4babbb5..a2e7ed3 100644
--- a/src/plugins/tnef_parse/ytnef.c
+++ b/src/plugins/tnef_parse/ytnef.c
@@ -317,14 +317,10 @@ int TNEFIcon STD_ARGLIST {
// -----------------------------------------------------------------------------
int TNEFRecipTable STD_ARGLIST {
- DWORD count;
BYTE *d;
- int current_row;
- int propcount;
- int current_prop;
d = data;
- count = SwapDWord(d);
+ SwapDWord(d);
d += 4;
// printf("Recipient Table containing %u rows\n", count);
diff --git a/src/plugins/vcalendar/libical/libical/icalrecur.c b/src/plugins/vcalendar/libical/libical/icalrecur.c
index 159b448..9c07e79 100644
--- a/src/plugins/vcalendar/libical/libical/icalrecur.c
+++ b/src/plugins/vcalendar/libical/libical/icalrecur.c
@@ -1272,10 +1272,12 @@ int next_hour(struct icalrecur_iterator_impl* impl)
int next_day(struct icalrecur_iterator_impl* impl)
{
- short has_by_data = (impl->by_ptrs[BY_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
short this_frequency = (impl->rule.freq == ICAL_DAILY_RECURRENCE);
+#ifndef NDEBUG
+ short has_by_data = (impl->by_ptrs[BY_DAY][0]!=ICAL_RECURRENCE_ARRAY_MAX);
assert(has_by_data || this_frequency);
+#endif /* NDEBUG */
if (next_hour(impl) == 0){
return 0;
@@ -1434,9 +1436,11 @@ int next_month(struct icalrecur_iterator_impl* impl)
{
int data_valid = 1;
+#ifndef NDEBUG
short this_frequency = (impl->rule.freq == ICAL_MONTHLY_RECURRENCE);
assert( has_by_data(impl,BY_MONTH) || this_frequency);
+#endif /* NDEBUG */
/* Iterate through the occurrences within a day. If we don't get to
the end of the intra-day data, don't bother going to the next
@@ -1582,7 +1586,6 @@ int next_week(struct icalrecur_iterator_impl* impl)
if( has_by_data){
/* Use the Week Number byrule data */
int week_no;
- struct icaltimetype t;
impl->by_indices[BY_WEEK_NO]++;
@@ -1593,10 +1596,6 @@ int next_week(struct icalrecur_iterator_impl* impl)
end_of_data = 1;
}
- t = impl->last;
- t.month=1; /* HACK, should be setting to the date of the first week of year*/
- t.day=1;
-
week_no = impl->by_ptrs[BY_WEEK_NO][impl->by_indices[BY_WEEK_NO]];
impl->last.day += week_no*7;
@@ -1624,7 +1623,7 @@ pvl_list expand_by_day(struct icalrecur_iterator_impl* impl,short year)
int i;
pvl_list days_list = pvl_newlist();
- short start_dow, end_dow, end_year_day, start_doy;
+ short start_dow, end_year_day, start_doy;
struct icaltimetype tmp = impl->last;
tmp.year= year;
@@ -1641,7 +1640,6 @@ pvl_list expand_by_day(struct icalrecur_iterator_impl* impl,short year)
tmp.day--;
tmp = icaltime_normalize(tmp);
- end_dow = icaltime_day_of_week(tmp);
end_year_day = icaltime_day_of_year(tmp);
for(i = 0; BYDAYPTR[i] != ICAL_RECURRENCE_ARRAY_MAX; i++){
@@ -1769,17 +1767,6 @@ int expand_year_days(struct icalrecur_iterator_impl* impl,short year)
case 1<<BY_WEEK_NO: {
/* FREQ=YEARLY; BYWEEKNO=20,50 */
- struct icaltimetype t;
- short dow;
-
- t.day = impl->dtstart.day;
- t.month = impl->dtstart.month;
- t.year = year;
- t.is_date = 1;
-
- dow = icaltime_day_of_week(t);
- /* HACK Not finished */
-
break;
}
diff --git a/src/plugins/vcalendar/libical/libical/icalrestriction.c.in b/src/plugins/vcalendar/libical/libical/icalrestriction.c.in
index 4544425..e027a83 100644
--- a/src/plugins/vcalendar/libical/libical/icalrestriction.c.in
+++ b/src/plugins/vcalendar/libical/libical/icalrestriction.c.in
@@ -271,7 +271,6 @@ int icalrestriction_check_component(icalproperty_method method,
icalcomponent_kind comp_kind;
icalrestriction_kind restr;
icalrestriction_property_record *prop_record;
- icalrestriction_component_record *comp_record;
char* funcr = 0;
icalproperty *prop;
diff --git a/src/plugins/vcalendar/libical/libical/icalvalue.c b/src/plugins/vcalendar/libical/libical/icalvalue.c
index c245095..9306514 100644
--- a/src/plugins/vcalendar/libical/libical/icalvalue.c
+++ b/src/plugins/vcalendar/libical/libical/icalvalue.c
@@ -539,12 +539,9 @@ icalvalue_is_valid (icalvalue* value)
char* icalvalue_binary_as_ical_string(icalvalue* value) {
- const char* data;
char* str;
icalerror_check_arg_rz( (value!=0),"value");
- data = icalvalue_get_binary(value);
-
str = (char*)icalmemory_tmp_buffer(60);
sprintf(str,"icalvalue_binary_as_ical_string is not implemented yet");
diff --git a/src/plugins/vcalendar/libical/libical/sspm.c b/src/plugins/vcalendar/libical/libical/sspm.c
index 7606521..731a5d5 100644
--- a/src/plugins/vcalendar/libical/libical/sspm.c
+++ b/src/plugins/vcalendar/libical/libical/sspm.c
@@ -1012,7 +1012,6 @@ int sspm_parse_mime(struct sspm_part *parts,
{
struct mime_impl impl;
struct sspm_header header;
- void *part;
int i;
/* Initialize all of the data */
@@ -1037,13 +1036,7 @@ int sspm_parse_mime(struct sspm_part *parts,
sspm_read_header(&impl,&header);
if(header.major == SSPM_MULTIPART_MAJOR_TYPE){
- struct sspm_header *child_header;
- child_header = &(impl.parts[impl.part_no].header);
-
sspm_store_part(&impl,header,impl.level,0,0);
-
- part = sspm_make_multipart_part(&impl,child_header);
-
} else {
void *part;
size_t size;
commit 820dd8afea1ef617a2a1c1ecb3a3994c34e0255d
Author: Colin Leroy <colin at colino.net>
Date: Thu Jun 19 07:52:58 2014 +0200
Add missing include; patch by Christian Hesse
diff --git a/src/plugins/rssyl/rssyl_update_format.c b/src/plugins/rssyl/rssyl_update_format.c
index 2b577dd..b607054 100644
--- a/src/plugins/rssyl/rssyl_update_format.c
+++ b/src/plugins/rssyl/rssyl_update_format.c
@@ -29,6 +29,7 @@
#include <alertpanel.h>
#include <log.h>
#include <mainwindow.h>
+#include <msgcache.h>
/* Local includes */
#include "old_feeds.h"
commit 314420a30cf9ac0ed03c7ba42320b4468dd352d7
Author: Colin Leroy <colin at colino.net>
Date: Thu Jun 19 07:52:29 2014 +0200
Fix possibly uninitialized variables; patch by Christian Hesse
diff --git a/src/plugins/clamd/libclamd/clamd-plugin.c b/src/plugins/clamd/libclamd/clamd-plugin.c
index 80bf1e9..d4a3c94 100644
--- a/src/plugins/clamd/libclamd/clamd-plugin.c
+++ b/src/plugins/clamd/libclamd/clamd-plugin.c
@@ -285,7 +285,7 @@ static int create_socket() {
struct sockaddr_in addr_i;
struct hostent *hp;
- int new_sock;
+ int new_sock = -1;
/*debug_set_mode(TRUE);*/
if (! Socket) {
diff --git a/src/plugins/mailmbox/mailmbox.c b/src/plugins/mailmbox/mailmbox.c
index b6265e9..48a7a68 100644
--- a/src/plugins/mailmbox/mailmbox.c
+++ b/src/plugins/mailmbox/mailmbox.c
@@ -1139,7 +1139,7 @@ static int claws_mailmbox_expunge_to_file_no_lock(char * dest_filename, int dest
int res;
unsigned long i;
size_t cur_offset;
- char * dest;
+ char * dest = NULL;
size_t size;
size = 0;
diff --git a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
index 02259a2..b8fb04a 100644
--- a/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
+++ b/src/plugins/notification/gtkhotkey/gtk-hotkey-key-file-registry.c
@@ -207,7 +207,7 @@ gtk_hotkey_key_file_registry_real_store_hotkey (GtkHotkeyRegistry *base,
GKeyFile *keyfile;
GFile *file, *home;
GError *tmp_error;
- gchar *file_path, *group;
+ gchar *file_path, *group = NULL;
g_return_val_if_fail (GTK_HOTKEY_IS_INFO (info), FALSE);
commit d0883509611b7ca136f5c3c3c51a1acbcbc95181
Author: Colin Leroy <colin at colino.net>
Date: Thu Jun 19 07:51:34 2014 +0200
Undeprecate libarchive calls; Patch by Christian Hesse.
diff --git a/src/plugins/archive/libarchive_archive.c b/src/plugins/archive/libarchive_archive.c
index 478202c..492fea7 100644
--- a/src/plugins/archive/libarchive_archive.c
+++ b/src/plugins/archive/libarchive_archive.c
@@ -389,7 +389,7 @@ const gchar* archive_extract(const char* archive_name, int flags) {
in = archive_read_new();
if ((res = archive_read_support_format_tar(in)) == ARCHIVE_OK) {
if ((res = archive_read_support_compression_gzip(in)) == ARCHIVE_OK) {
- if ((res = archive_read_open_file(
+ if ((res = archive_read_open_filename(
in, archive_name, READ_BLOCK_SIZE)) != ARCHIVE_OK) {
buf = g_strdup_printf(
"%s: %s\n", archive_name, archive_error_string(in));
@@ -444,7 +444,7 @@ const gchar* archive_extract(const char* archive_name, int flags) {
result = archive_error_string(out);
archive_read_close(in);
}
- archive_read_finish(in);
+ archive_read_free(in);
}
else
result = archive_error_string(in);
@@ -478,21 +478,21 @@ const gchar* archive_create(const char* archive_name, GSList* files,
arch = archive_write_new();
switch (method) {
case ZIP:
- if (archive_write_set_compression_gzip(arch) != ARCHIVE_OK)
+ if (archive_write_add_filter_gzip(arch) != ARCHIVE_OK)
return archive_error_string(arch);
break;
case BZIP2:
- if (archive_write_set_compression_bzip2(arch) != ARCHIVE_OK)
+ if (archive_write_add_filter_bzip2(arch) != ARCHIVE_OK)
return archive_error_string(arch);
break;
#if NEW_ARCHIVE_API
case COMPRESS:
- if (archive_write_set_compression_compress(arch) != ARCHIVE_OK)
+ if (archive_write_add_filter_compress(arch) != ARCHIVE_OK)
return archive_error_string(arch);
break;
#endif
case NO_COMPRESS:
- if (archive_write_set_compression_none(arch) != ARCHIVE_OK)
+ if (archive_write_add_filter_none(arch) != ARCHIVE_OK)
return archive_error_string(arch);
break;
}
@@ -516,7 +516,7 @@ const gchar* archive_create(const char* archive_name, GSList* files,
case NO_FORMAT:
return "Missing archive format";
}
- if (archive_write_open_file(arch, archive_name) != ARCHIVE_OK)
+ if (archive_write_open_filename(arch, archive_name) != ARCHIVE_OK)
return archive_error_string(arch);
while (files && ! stop_action) {
@@ -592,7 +592,7 @@ const gchar* archive_create(const char* archive_name, GSList* files,
stop_action = FALSE;
#endif
archive_write_close(arch);
- archive_write_finish(arch);
+ archive_write_free(arch);
return NULL;
}
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list