[Commits] [SCM] claws branch, master, updated. 3.14.0-52-g6110e70
Colin
colin at claws-mail.org
Wed Aug 31 17:10:26 CEST 2016
The branch, master has been updated
via 6110e7055f145549af317a4c9cf05f6e2c1b620e (commit)
via b794c279c9d6d71e534b3a40126124572ea89610 (commit)
via 9730a98ed2381c7b3d180e290038721dc0a1c28b (commit)
from 371bbb58ad220a65c15674904d7d7b58cc3e99c2 (commit)
Summary of changes:
src/addrindex.c | 1 -
src/common/xmlprops.c | 1 -
src/editaddress.c | 2 +-
src/etpan/imap-thread.c | 7 ++++++-
src/filtering.c | 2 +-
src/gtk/gtkcmctree.c | 2 +-
src/gtk/gtksctree.c | 2 +-
src/mbox.c | 4 ----
src/messageview.c | 2 --
src/mh.c | 4 ++--
10 files changed, 12 insertions(+), 15 deletions(-)
- Log -----------------------------------------------------------------
commit 6110e7055f145549af317a4c9cf05f6e2c1b620e
Author: Colin Leroy <colin at colino.net>
Date: Wed Aug 31 17:11:24 2016 +0200
Fix a few Coverity issues
diff --git a/src/editaddress.c b/src/editaddress.c
index 22572b1..e1b5534 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -1559,7 +1559,7 @@ static gboolean addressbook_edit_person_close( gboolean cancelled )
listEMail = NULL;
listAttrib = NULL;
- if( ! cancelled ) {
+ if(!cancelled && current_person != NULL) {
/* Set current_person stuff */
gchar *name;
diff --git a/src/etpan/imap-thread.c b/src/etpan/imap-thread.c
index 6af12b1..4bfa537 100644
--- a/src/etpan/imap-thread.c
+++ b/src/etpan/imap-thread.c
@@ -2869,7 +2869,12 @@ imap_get_envelopes_list(mailimap * imap, struct mailimap_set * set,
r = imap_add_envelope_fetch_att(fetch_type);
else
r = imap_add_header_fetch_att(fetch_type);
-
+
+ if (r != MAILIMAP_NO_ERROR) {
+ debug_print("add fetch attr: %d\n", r);
+ return r;
+ }
+
mailstream_logger = imap_logger_fetch;
r = mailimap_uid_fetch(imap, set, fetch_type, &fetch_result);
diff --git a/src/filtering.c b/src/filtering.c
index 794b529..7b604a8 100644
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -237,7 +237,7 @@ void filtering_move_and_copy_msgs(GSList *msgs)
} else {
debug_print("%d messages to %s in %s\n", found,
cur_op==IS_COPY ? "copy":(cur_op==IS_DELE ?"delete":"move"),
- last_item?(last_item->name ? last_item->name:"(noname)"):"nowhere");
+ last_item->name ? last_item->name:"(noname)");
}
for (cur = batch; cur; cur = cur->next) {
MsgInfo *info = (MsgInfo *)cur->data;
diff --git a/src/gtk/gtkcmctree.c b/src/gtk/gtkcmctree.c
index f8f80a6..d1d587d 100644
--- a/src/gtk/gtkcmctree.c
+++ b/src/gtk/gtkcmctree.c
@@ -1556,7 +1556,7 @@ gtk_cmctree_link (GtkCMCTree *ctree,
list_end->next = work->next;
if (work->next)
- list = work->next->prev = list_end;
+ work->next->prev = list_end;
work->next = (GList *)node;
list = (GList *)node;
list->prev = work;
diff --git a/src/gtk/gtksctree.c b/src/gtk/gtksctree.c
index b7a86ee..4519657 100644
--- a/src/gtk/gtksctree.c
+++ b/src/gtk/gtksctree.c
@@ -1451,7 +1451,7 @@ gtk_sctree_link (GtkCMCTree *ctree,
list_end->next = work->next;
if (work->next)
- list = work->next->prev = list_end;
+ work->next->prev = list_end;
work->next = (GList *)node;
list = (GList *)node;
list->prev = work;
diff --git a/src/mbox.c b/src/mbox.c
index 6b8ad38..c084602 100644
--- a/src/mbox.c
+++ b/src/mbox.c
@@ -495,10 +495,6 @@ gint copy_mbox(gint srcfd, const gchar *dest)
}
while ((n_read = read(srcfd, buf, sizeof(buf))) > 0) {
- if (n_read == -1 && errno != 0) {
- save_errno = errno;
- break;
- }
if (fwrite(buf, 1, n_read, dest_fp) < n_read) {
g_warning("writing to %s failed.", dest);
fclose(dest_fp);
diff --git a/src/messageview.c b/src/messageview.c
index 9d456c4..e0c0d30 100644
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -2642,9 +2642,7 @@ static void goto_unread_folder_cb(GtkAction *action, gpointer data)
static void goto_folder_cb(GtkAction *action, gpointer data)
{
MessageView *messageview = (MessageView *)data;
- messageview->updating = TRUE;
FolderItem *to_folder;
- messageview->updating = FALSE;
to_folder = foldersel_folder_sel(NULL, FOLDER_SEL_ALL, NULL, FALSE);
diff --git a/src/mh.c b/src/mh.c
index 2ed2289..3798c64 100644
--- a/src/mh.c
+++ b/src/mh.c
@@ -226,7 +226,7 @@ gboolean mh_scan_required(Folder *folder, FolderItem *item)
if ((s.st_mtime > item->mtime) &&
(s.st_mtime - 3600 != item->mtime)) {
debug_print("MH scan required, folder updated: %s (%ld > %ld)\n",
- path?path:"(null)",
+ path,
(long int) s.st_mtime,
(long int) item->mtime);
g_free(path);
@@ -234,7 +234,7 @@ gboolean mh_scan_required(Folder *folder, FolderItem *item)
}
debug_print("MH scan not required: %s (%ld <= %ld)\n",
- path?path:"(null)",
+ path,
(long int) s.st_mtime,
(long int) item->mtime);
g_free(path);
commit b794c279c9d6d71e534b3a40126124572ea89610
Author: Colin Leroy <colin at colino.net>
Date: Wed Aug 31 16:47:50 2016 +0200
Remove useless code
diff --git a/src/common/xmlprops.c b/src/common/xmlprops.c
index dea67f4..9aadc3b 100644
--- a/src/common/xmlprops.c
+++ b/src/common/xmlprops.c
@@ -272,7 +272,6 @@ static void xmlprops_read_props( XmlProperty *props, XMLFile *file ) {
pValue = g_strdup("");
if (! file->level ) break;
xml_parse_next_tag( file );
- xml_get_current_tag( file );
if( xml_compare_tag( file, XMLS_ELTAG_PROPERTY ) ) {
attr = xml_get_current_tag_attr( file );
while( attr ) {
commit 9730a98ed2381c7b3d180e290038721dc0a1c28b
Author: Colin Leroy <colin at colino.net>
Date: Wed Aug 31 16:44:40 2016 +0200
Remove useless code
diff --git a/src/addrindex.c b/src/addrindex.c
index f102e96..d11e210 100644
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -1322,7 +1322,6 @@ static void addrindex_parse_ldap_attrlist( XMLFile *file, LdapControl *ctl ) {
break;
}
}
- xtag = xtagPrev;
}
/* Build list of search attributes */
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list