[balsa/wip/gmime3: 29/197] Build with -Wshadow
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa/wip/gmime3: 29/197] Build with -Wshadow
- Date: Wed, 23 May 2018 21:14:48 +0000 (UTC)
commit e671bfa3c777ca703e366b09b3c8f68501a309fd
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Sat Jul 15 20:43:01 2017 -0400
Build with -Wshadow
Do not use local variables that shadow other variables
* libbalsa/address-book-text.c (lbab_text_load_file):
* libbalsa/address-view.c (lbav_set_text):
* libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_verify),
(g_mime_part_rfc2440_decrypt):
* libbalsa/imap/imap-tls.c (imap_check_server_identity):
* libbalsa/libbalsa-conf.c (lbc_init):
* libbalsa/libbalsa.c (libbalsa_is_cert_known):
* libbalsa/mailbox.c (libbalsa_mailbox_add_messages):
* libbalsa/mailbox_imap.c (imap_expunge_cb),
(internet_address_new_list_from_imap_address),
(libbalsa_mailbox_imap_add_messages), (icm_restore_from_cache):
* libbalsa/mailbox_local.c
(libbalsa_mailbox_local_prepare_threading):
* libbalsa/mailbox_mh.c (libbalsa_mailbox_mh_get_message_stream),
(libbalsa_mailbox_mh_check), (libbalsa_mailbox_mh_sync),
(libbalsa_mailbox_mh_fetch_message_structure),
(lbm_mh_add_message):
* libbalsa/mime.c (libbalsa_text_to_html):
* libbalsa/send.c (libbalsa_message_create_mime_message):
* src/balsa-mblist.c (bmbl_select_mailbox):
* src/balsa-message.c (balsa_part_info_free):
* src/filter-run-dialog.c (filters_run_dialog):
* src/main-window.c:
* src/save-restore.c (config_global_load):
* src/sendmsg-window.c (sw_edit_activated),
(update_bsmsg_identity), (scan_bodies), (create_lang_menu),
(send_message_handler), (sendmsg_window_new_from_list),
(sendmsg_window_continue):
ChangeLog | 46 ++++++++++++++++++
libbalsa/address-book-text.c | 3 +-
libbalsa/address-view.c | 8 ++--
libbalsa/gmime-part-rfc2440.c | 6 +-
libbalsa/imap/imap-tls.c | 6 +-
libbalsa/libbalsa-conf.c | 12 ++--
libbalsa/libbalsa.c | 4 +-
libbalsa/mailbox.c | 4 +-
libbalsa/mailbox_imap.c | 23 ++++-----
libbalsa/mailbox_local.c | 2 -
libbalsa/mailbox_mh.c | 104 ++++++++++++++++++++--------------------
libbalsa/mime.c | 3 +-
libbalsa/send.c | 8 ++--
src/balsa-mblist.c | 5 +-
src/balsa-message.c | 6 +-
src/filter-run-dialog.c | 4 +-
src/main-window.c | 1 -
src/save-restore.c | 29 ++++++------
src/sendmsg-window.c | 45 ++++++++---------
19 files changed, 179 insertions(+), 140 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index b3cfb49..bf7fa0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+<<<<<<< HEAD
+=======
+2017-07-15 Peter Bloomfield <pbloomfield bellsouth net>
+
+ Do not use local variables that shadow other variables
+
+ * libbalsa/address-book-text.c (lbab_text_load_file):
+ * libbalsa/address-view.c (lbav_set_text):
+ * libbalsa/gmime-part-rfc2440.c (g_mime_part_rfc2440_verify),
+ (g_mime_part_rfc2440_decrypt):
+ * libbalsa/imap/imap-tls.c (imap_check_server_identity):
+ * libbalsa/libbalsa-conf.c (lbc_init):
+ * libbalsa/libbalsa.c (libbalsa_is_cert_known):
+ * libbalsa/mailbox.c (libbalsa_mailbox_add_messages):
+ * libbalsa/mailbox_imap.c (imap_expunge_cb),
+ (internet_address_new_list_from_imap_address),
+ (libbalsa_mailbox_imap_add_messages), (icm_restore_from_cache):
+ * libbalsa/mailbox_local.c
+ (libbalsa_mailbox_local_prepare_threading):
+ * libbalsa/mailbox_mh.c (libbalsa_mailbox_mh_get_message_stream),
+ (libbalsa_mailbox_mh_check), (libbalsa_mailbox_mh_sync),
+ (libbalsa_mailbox_mh_fetch_message_structure),
+ (lbm_mh_add_message):
+ * libbalsa/mime.c (libbalsa_text_to_html):
+ * libbalsa/send.c (libbalsa_message_create_mime_message):
+ * src/balsa-mblist.c (bmbl_select_mailbox):
+ * src/balsa-message.c (balsa_part_info_free):
+ * src/filter-run-dialog.c (filters_run_dialog):
+ * src/main-window.c:
+ * src/save-restore.c (config_global_load):
+ * src/sendmsg-window.c (sw_edit_activated),
+ (update_bsmsg_identity), (scan_bodies), (create_lang_menu),
+ (send_message_handler), (sendmsg_window_new_from_list),
+ (sendmsg_window_continue):
+
+2017-07-15 Peter Bloomfield <pbloomfield bellsouth net>
+
+ * src/balsa-app.c (balsa_find_dir): put braces around empty "if"
+ block.
+
+2017-07-15 Peter Bloomfield <pbloomfield bellsouth net>
+
+ * libbalsa/address.c (libbalsa_address_get_edit_widget): do not
+ use old style declaration.
+
+>>>>>>> 3d41c63... Build with -Wshadow
2017-07-15 Albrecht Dreß
* libbalsa/libbalsa-progress.c (revealer_destroy_notify),
diff --git a/libbalsa/address-book-text.c b/libbalsa/address-book-text.c
index 9e9e8e2..04cf2f4 100644
--- a/libbalsa/address-book-text.c
+++ b/libbalsa/address-book-text.c
@@ -344,8 +344,6 @@ lbab_text_load_file(LibBalsaAddressBookText * ab_text, FILE * stream)
#if MAKE_GROUP_BY_ORGANIZATION
gchar **groups, **group;
#endif /* MAKE_GROUP_BY_ORGANIZATION */
- GList *l;
-
if (!address)
continue;
@@ -354,6 +352,7 @@ lbab_text_load_file(LibBalsaAddressBookText * ab_text, FILE * stream)
/* Create a group address. */
InternetAddress *ia =
internet_address_group_new(address->full_name);
+ GList *l;
for (l = address->address_list; l; l = l->next) {
InternetAddress *member =
diff --git a/libbalsa/address-view.c b/libbalsa/address-view.c
index 2415c12..f788297 100644
--- a/libbalsa/address-view.c
+++ b/libbalsa/address-view.c
@@ -520,11 +520,11 @@ lbav_set_text(LibBalsaAddressView * address_view, const gchar * text)
else {
/* No valid addresses found; just set the new text and keep
* the focus in this line. */
- gchar *name = g_strdup(text);
- lbav_clean_text(name);
+ gchar *text_dup = g_strdup(text);
+ lbav_clean_text(text_dup);
gtk_list_store_set(address_store, &iter,
- ADDRESS_NAME_COL, name, -1);
- g_free(name);
+ ADDRESS_NAME_COL, text_dup, -1);
+ g_free(text_dup);
}
return;
}
diff --git a/libbalsa/gmime-part-rfc2440.c b/libbalsa/gmime-part-rfc2440.c
index 44c6003..76a5ef2 100644
--- a/libbalsa/gmime-part-rfc2440.c
+++ b/libbalsa/gmime-part-rfc2440.c
@@ -257,8 +257,7 @@ g_mime_part_rfc2440_verify(GMimePart * part, GError ** err)
/* upon success, replace the signed content by the checked one */
if (result && g_mime_stream_length(plainstream) > 0) {
- GMimeDataWrapper *wrapper = g_mime_data_wrapper_new();
-
+ wrapper = g_mime_data_wrapper_new();
g_mime_data_wrapper_set_stream(wrapper, plainstream);
g_mime_part_set_content(GMIME_PART(part), wrapper);
g_object_unref(wrapper);
@@ -318,7 +317,6 @@ g_mime_part_rfc2440_decrypt(GMimePart * part, GtkWindow * parent,
GMimeStream *filter_stream;
GMimeStream *out_stream;
GMimeFilter *filter;
- GMimeDataWrapper *wrapper = g_mime_data_wrapper_new();
/* strip crlf off encrypted stuff coming from Winbloze crap */
filter_stream = g_mime_stream_filter_new(plainstream);
@@ -329,8 +327,10 @@ g_mime_part_rfc2440_decrypt(GMimePart * part, GtkWindow * parent,
/* replace the old contents by the decrypted stuff */
out_stream = g_mime_stream_mem_new();
+ wrapper = g_mime_data_wrapper_new();
g_mime_data_wrapper_set_stream(wrapper, out_stream);
g_mime_part_set_content(part, wrapper);
+ g_object_unref(wrapper);
g_mime_stream_reset(filter_stream);
g_mime_stream_write_to_stream(filter_stream, out_stream);
g_object_unref(filter_stream);
diff --git a/libbalsa/imap/imap-tls.c b/libbalsa/imap/imap-tls.c
index 3283c70..b6de4a3 100644
--- a/libbalsa/imap/imap-tls.c
+++ b/libbalsa/imap/imap-tls.c
@@ -249,12 +249,12 @@ imap_check_server_identity(SSL *ssl, const char *host,
int i;
for (i=0; i< sk_GENERAL_NAME_num(altnames); i++) {
- const GENERAL_NAME *name = sk_GENERAL_NAME_value(altnames, i);
+ const GENERAL_NAME *current_name = sk_GENERAL_NAME_value(altnames, i);
/* We handle only GEN_DNS. GEN_IP (certificates for IP numbers)
are too weird to be real in IMAP case. */
- if (name->type == GEN_DNS) {
- const ASN1_IA5STRING *ia5 = name->d.ia5;
+ if (current_name->type == GEN_DNS) {
+ const ASN1_IA5STRING *ia5 = current_name->d.ia5;
const char *name = (const char*)ia5->data;
has_extension_with_dns_name = 1;
diff --git a/libbalsa/libbalsa-conf.c b/libbalsa/libbalsa-conf.c
index 4e53f5a..9d1a271 100644
--- a/libbalsa/libbalsa-conf.c
+++ b/libbalsa/libbalsa-conf.c
@@ -106,7 +106,7 @@ lbc_init(LibBalsaConf * conf, const gchar * filename,
if (!g_key_file_load_from_file
(conf->key_file, conf->path, G_KEY_FILE_NONE, &error)) {
gchar *old_path;
- gchar *buf;
+ gchar *key_file_text;
static gboolean warn = TRUE;
old_path =
@@ -117,18 +117,18 @@ lbc_init(LibBalsaConf * conf, const gchar * filename,
#endif /* DEBUG */
g_clear_error(&error);
- buf = lbc_readfile(old_path);
- if (buf) {
+ key_file_text = lbc_readfile(old_path);
+ if (key_file_text != NULL) {
/* GnomeConfig used ' ' as the list separator... */
g_key_file_set_list_separator(conf->key_file, ' ');
- g_key_file_load_from_data(conf->key_file, buf, -1,
+ g_key_file_load_from_data(conf->key_file, key_file_text, -1,
G_KEY_FILE_KEEP_COMMENTS, &error);
- g_free(buf);
+ g_free(key_file_text);
/* ...but GKeyFile doesn't handle it properly, so we'll
* revert to the default ';'. */
g_key_file_set_list_separator(conf->key_file, ';');
}
- if (!buf || error) {
+ if (key_file_text == NULL || error != NULL) {
#if DEBUG
g_message("Could not load key file from file “%s”: %s",
old_path,
diff --git a/libbalsa/libbalsa.c b/libbalsa/libbalsa.c
index b5e6177..b4f4373 100644
--- a/libbalsa/libbalsa.c
+++ b/libbalsa/libbalsa.c
@@ -436,8 +436,8 @@ libbalsa_is_cert_known(X509* cert, long vfy_result)
g_mutex_lock(&certificate_lock);
for(lst = accepted_certs; lst; lst = lst->next) {
- int res = X509_cmp(cert, lst->data);
- if(res == 0) {
+ int X509_res = X509_cmp(cert, lst->data);
+ if(X509_res == 0) {
g_mutex_unlock(&certificate_lock);
return TRUE;
}
diff --git a/libbalsa/mailbox.c b/libbalsa/mailbox.c
index fe75f39..59c249d 100644
--- a/libbalsa/mailbox.c
+++ b/libbalsa/mailbox.c
@@ -1847,7 +1847,7 @@ libbalsa_mailbox_add_message(LibBalsaMailbox * mailbox,
guint
libbalsa_mailbox_add_messages(LibBalsaMailbox * mailbox,
- LibBalsaAddMessageIterator msg_iterator,
+ LibBalsaAddMessageIterator iterator,
void *arg,
GError ** err)
{
@@ -1859,7 +1859,7 @@ libbalsa_mailbox_add_messages(LibBalsaMailbox * mailbox,
retval =
LIBBALSA_MAILBOX_GET_CLASS(mailbox)->add_messages(mailbox,
- msg_iterator, arg,
+ iterator, arg,
err);
if (retval) {
diff --git a/libbalsa/mailbox_imap.c b/libbalsa/mailbox_imap.c
index 0ec27f6..1086b0c 100644
--- a/libbalsa/mailbox_imap.c
+++ b/libbalsa/mailbox_imap.c
@@ -614,10 +614,10 @@ mi_reconnect(ImapMboxHandle *h)
else if(rc==IMR_PROTOCOL) \
libbalsa_information(LIBBALSA_INFORMATION_WARNING, \
_("IMAP protocol error. Try enabling bug workarounds.")); \
- else if(rc==IMR_BYE) {char *msg = imap_mbox_handle_get_last_msg(h); \
+ else if(rc==IMR_BYE) {char *text = imap_mbox_handle_get_last_msg(h); \
libbalsa_information(LIBBALSA_INFORMATION_WARNING, \
- _("IMAP server has shut the connection: %s Reconnecting…"), msg); \
- g_free(msg);}\
+ _("IMAP server has shut the connection: %s Reconnecting…"), text); \
+ g_free(text);}\
else break;}while(trials-->0);}
#define IIA(rc,h,line,cmd) \
{int trials=2;do{\
@@ -941,12 +941,12 @@ imap_expunge_cb(ImapMboxHandle *handle, unsigned seqno,
}
for (i = seqno - 1; i < mimap->messages_info->len; i++) {
- struct message_info *msg_info =
+ struct message_info *info =
&g_array_index(mimap->messages_info, struct message_info, i);
- g_assert(msg_info != NULL);
- if (msg_info->message)
- msg_info->message->msgno = i + 1;
+ g_assert(info != NULL);
+ if (info->message)
+ info->message->msgno = i + 1;
}
libbalsa_unlock_mailbox(mailbox);
@@ -1958,19 +1958,19 @@ internet_address_new_list_from_imap_address(ImapAddress *list,
/* Group */
if (list->name) {
/* Group head */
- ImapAddress *tail = NULL;
+ ImapAddress *imap_addr = NULL;
InternetAddressList *l;
gchar *tmp = g_mime_utils_header_decode_text(libbalsa_parser_options(), list->name);
addr = internet_address_group_new(tmp);
g_free(tmp);
l = internet_address_new_list_from_imap_address(list->next,
- &tail);
+ &imap_addr);
if (l) {
internet_address_group_set_members
(INTERNET_ADDRESS_GROUP(addr), l);
g_object_unref(l);
}
- list = tail;
+ list = imap_addr;
} else {
/* tail */
if (tail)
@@ -2988,7 +2988,6 @@ libbalsa_mailbox_imap_add_messages(LibBalsaMailbox * mailbox,
if(!imap_sequence_empty(&uid_sequence) &&
g_list_length(macd.outfiles) == imap_sequence_length(&uid_sequence)) {
/* Hurray, server returned UID data on appended messages! */
- LibBalsaMailboxImap *mimap = LIBBALSA_MAILBOX_IMAP(mailbox);
LibBalsaServer *s = LIBBALSA_MAILBOX_REMOTE(mailbox)->server;
LibBalsaImapServer *is = LIBBALSA_IMAP_SERVER(s);
gboolean is_persistent = libbalsa_imap_server_has_persistent_cache(is);
@@ -3557,7 +3556,7 @@ icm_restore_from_cache(ImapMboxHandle *h, struct ImapCacheManager *icm)
GArray *uidmap = g_array_sized_new(FALSE, TRUE,
sizeof(uint32_t), icm->exists);
ImapSearchKey *k;
- unsigned lo = icm->uidmap->len+1, hi = 0, i;
+ unsigned lo = icm->uidmap->len+1, hi = 0;
/* printf("UIDSYNC:Searching range [1:%u]\n", icm->uidmap->len); */
for(i=1; i<=icm->uidmap->len; i++)
if(g_array_index(icm->uidmap, uint32_t, i-1)) {lo=i; break; }
diff --git a/libbalsa/mailbox_local.c b/libbalsa/mailbox_local.c
index 4f6d47f..16b6538 100644
--- a/libbalsa/mailbox_local.c
+++ b/libbalsa/mailbox_local.c
@@ -1356,8 +1356,6 @@ libbalsa_mailbox_local_prepare_threading(LibBalsaMailbox * mailbox,
libbalsa_progress_set_text(&progress, NULL, 0);
if (retval && need_thread && !local->thread_id) {
- LibBalsaMailbox *mailbox = LIBBALSA_MAILBOX(local);
-
if (libbalsa_mailbox_get_threading_type(mailbox) !=
LB_MAILBOX_THREADING_FLAT
|| libbalsa_mailbox_get_sort_field(mailbox) !=
diff --git a/libbalsa/mailbox_mh.c b/libbalsa/mailbox_mh.c
index 3e680a1..5ff2858 100644
--- a/libbalsa/mailbox_mh.c
+++ b/libbalsa/mailbox_mh.c
@@ -264,15 +264,15 @@ libbalsa_mailbox_mh_get_message_stream(LibBalsaMailbox * mailbox,
{
GMimeStream *stream;
struct message_info *msg_info;
- gchar *tmp;
+ gchar *base_name;
g_return_val_if_fail(MAILBOX_OPEN(mailbox), NULL);
msg_info = lbm_mh_message_info_from_msgno(LIBBALSA_MAILBOX_MH(mailbox),
msgno);
- tmp = MH_BASENAME(msg_info);
- stream = libbalsa_mailbox_local_get_message_stream(mailbox, tmp, NULL);
- g_free(tmp);
+ base_name = MH_BASENAME(msg_info);
+ stream = libbalsa_mailbox_local_get_message_stream(mailbox, base_name, NULL);
+ g_free(base_name);
return stream;
}
@@ -625,14 +625,14 @@ libbalsa_mailbox_mh_check(LibBalsaMailbox * mailbox)
/* create .mh_sequences when there isn't one. */
if (stat(mh->sequences_filename, &st_sequences) == -1) {
if (errno == ENOENT) {
- gchar *tmp;
- int fd = libbalsa_mailbox_mh_open_temp(path, &tmp);
+ gchar *name_used;
+ int fd = libbalsa_mailbox_mh_open_temp(path, &name_used);
if (fd != -1) {
close(fd);
- if (libbalsa_safe_rename(tmp,
+ if (libbalsa_safe_rename(name_used,
mh->sequences_filename) == -1)
- unlink(tmp);
- g_free(tmp);
+ unlink(name_used);
+ g_free(name_used);
}
if (stat(mh->sequences_filename, &st_sequences) == -1)
modified = 1;
@@ -668,12 +668,12 @@ libbalsa_mailbox_mh_check(LibBalsaMailbox * mailbox)
/* Was any message removed? */
renumber = mh->msgno_2_msg_info->len + 1;
for (msgno = 1; msgno <= mh->msgno_2_msg_info->len; ) {
- gchar *tmp, *filename;
+ gchar *base_name, *filename;
msg_info = lbm_mh_message_info_from_msgno(mh, msgno);
- tmp = MH_BASENAME(msg_info);
- filename = g_build_filename(path, tmp, NULL);
- g_free(tmp);
+ base_name = MH_BASENAME(msg_info);
+ filename = g_build_filename(path, base_name, NULL);
+ g_free(base_name);
if (access(filename, F_OK) == 0)
msgno++;
else {
@@ -784,7 +784,7 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox * mailbox, gboolean expunge)
LibBalsaMailboxMh *mh;
struct line_info unseen, flagged, replied, recent;
const gchar *path;
- gchar *tmp;
+ gchar *name_used;
guint msgno;
struct message_info *msg_info;
@@ -834,9 +834,9 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox * mailbox, gboolean expunge)
/* MH just moves files out of the way when you delete them */
/* chbm: not quite, however this is probably a good move for
flag deleted */
- char *tmp = MH_BASENAME(msg_info);
- char *orig = g_build_filename(path, tmp, NULL);
- g_free(tmp);
+ char *base_name = MH_BASENAME(msg_info);
+ char *orig = g_build_filename(path, base_name, NULL);
+ g_free(base_name);
unlink(orig);
g_free(orig);
/* free old information */
@@ -851,20 +851,20 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox * mailbox, gboolean expunge)
lbm_mh_flag_line(msg_info, LIBBALSA_MESSAGE_FLAG_RECENT, &recent);
if ((msg_info->local_info.flags ^ msg_info->orig_flags) &
LIBBALSA_MESSAGE_FLAG_DELETED) {
- gchar *tmp;
+ gchar *base_name;
gchar *old_file;
gchar *new_file;
- tmp = MH_BASENAME(msg_info);
- old_file = g_build_filename(path, tmp, NULL);
- g_free(tmp);
+ base_name = MH_BASENAME(msg_info);
+ old_file = g_build_filename(path, base_name, NULL);
+ g_free(base_name);
msg_info->orig_flags =
REAL_FLAGS(msg_info->local_info.flags);
- tmp = MH_BASENAME(msg_info);
- new_file = g_build_filename(path, tmp, NULL);
- g_free(tmp);
+ base_name = MH_BASENAME(msg_info);
+ new_file = g_build_filename(path, base_name, NULL);
+ g_free(base_name);
if (libbalsa_safe_rename(old_file, new_file) == -1) {
/* FIXME: report error ... */
@@ -892,10 +892,10 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox * mailbox, gboolean expunge)
/* open tempfile */
path = libbalsa_mailbox_local_get_path(mailbox);
- fd = libbalsa_mailbox_mh_open_temp(path, &tmp);
+ fd = libbalsa_mailbox_mh_open_temp(path, &name_used);
if (fd == -1)
{
- g_free(tmp);
+ g_free(name_used);
g_object_unref(unseen.line);
g_object_unref(flagged.line);
g_object_unref(replied.line);
@@ -918,18 +918,18 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox * mailbox, gboolean expunge)
g_object_unref(gmime_stream);
line = g_byte_array_new();
do {
- gchar *tmp;
+ gchar *buf;
line->len = 0;
g_mime_stream_buffer_readln(gmime_stream_buffer, line);
- tmp = (gchar *) line->data;
- if (tmp &&
- !libbalsa_str_has_prefix(tmp, LibBalsaMailboxMhUnseen) &&
- !libbalsa_str_has_prefix(tmp, LibBalsaMailboxMhFlagged) &&
- !libbalsa_str_has_prefix(tmp, LibBalsaMailboxMhReplied) &&
- !libbalsa_str_has_prefix(tmp, LibBalsaMailboxMhRecent)) {
+ buf = (gchar *) line->data;
+ if (buf &&
+ !libbalsa_str_has_prefix(buf, LibBalsaMailboxMhUnseen) &&
+ !libbalsa_str_has_prefix(buf, LibBalsaMailboxMhFlagged) &&
+ !libbalsa_str_has_prefix(buf, LibBalsaMailboxMhReplied) &&
+ !libbalsa_str_has_prefix(buf, LibBalsaMailboxMhRecent)) {
/* unknown sequence */
- g_mime_stream_write(temp_stream, tmp, line->len);
+ g_mime_stream_write(temp_stream, buf, line->len);
}
} while (!g_mime_stream_eos(gmime_stream_buffer));
g_object_unref(gmime_stream_buffer);
@@ -942,8 +942,8 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox * mailbox, gboolean expunge)
!lbm_mh_finish_line(&replied, temp_stream, LibBalsaMailboxMhReplied) ||
!lbm_mh_finish_line(&recent, temp_stream, LibBalsaMailboxMhRecent)) {
g_object_unref(temp_stream);
- unlink(tmp);
- g_free(tmp);
+ unlink(name_used);
+ g_free(name_used);
g_object_unref(unseen.line);
g_object_unref(flagged.line);
g_object_unref(replied.line);
@@ -963,20 +963,20 @@ libbalsa_mailbox_mh_sync(LibBalsaMailbox * mailbox, gboolean expunge)
unlink(sequences_filename);
/* rename tempfile to '.mh_sequences' */
- retval = (libbalsa_safe_rename(tmp, sequences_filename) != -1);
+ retval = (libbalsa_safe_rename(name_used, sequences_filename) != -1);
#ifdef DEBUG
if (!retval)
g_print("MH sync “%s”: error renaming sequences file.\n", path);
#endif
if (!retval)
- unlink (tmp);
+ unlink (name_used);
/* Record the mtimes; we'll just use the current time--someone else
* might have changed something since we did, despite the file
* locking, but we'll find out eventually. */
libbalsa_mailbox_set_mtime(mailbox, mh->mtime_sequences = time(NULL));
- g_free(tmp);
+ g_free(name_used);
g_object_unref(unseen.line);
g_object_unref(flagged.line);
g_object_unref(replied.line);
@@ -1004,16 +1004,16 @@ libbalsa_mailbox_mh_fetch_message_structure(LibBalsaMailbox * mailbox,
{
if (!message->mime_msg) {
struct message_info *msg_info;
- gchar *tmp;
+ gchar *base_name;
msg_info =
lbm_mh_message_info_from_msgno(LIBBALSA_MAILBOX_MH(mailbox),
message->msgno);
- tmp = MH_BASENAME(msg_info);
+ base_name = MH_BASENAME(msg_info);
message->mime_msg =
- libbalsa_mailbox_local_get_mime_message(mailbox, tmp, NULL);
- g_free(tmp);
+ libbalsa_mailbox_local_get_mime_message(mailbox, base_name, NULL);
+ g_free(base_name);
if (message->mime_msg) {
g_mime_object_remove_header(GMIME_OBJECT(message->mime_msg),
@@ -1061,7 +1061,7 @@ lbm_mh_add_message(LibBalsaMailboxLocal * local,
{
LibBalsaMailboxMh *mh;
const char *path;
- char *tmp;
+ char *name_used;
int fd;
GMimeStream *out_stream;
GMimeFilter *crlffilter;
@@ -1076,12 +1076,12 @@ lbm_mh_add_message(LibBalsaMailboxLocal * local,
/* open tempfile */
path = libbalsa_mailbox_local_get_path(local);
- fd = libbalsa_mailbox_mh_open_temp(path, &tmp);
+ fd = libbalsa_mailbox_mh_open_temp(path, &name_used);
if (fd == -1) {
g_set_error(err, LIBBALSA_MAILBOX_ERROR,
LIBBALSA_MAILBOX_APPEND_ERROR,
_("Cannot create message"));
- g_free(tmp);
+ g_free(name_used);
return FALSE;
}
out_stream = g_mime_stream_fs_new(fd);
@@ -1099,8 +1099,8 @@ lbm_mh_add_message(LibBalsaMailboxLocal * local,
g_set_error(err, LIBBALSA_MAILBOX_ERROR,
LIBBALSA_MAILBOX_APPEND_ERROR,
_("Data copy error"));
- unlink(tmp);
- g_free(tmp);
+ unlink(name_used);
+ g_free(name_used);
return FALSE;
}
g_object_unref(out_stream);
@@ -1115,7 +1115,7 @@ lbm_mh_add_message(LibBalsaMailboxLocal * local,
gint rename_status;
new_filename = g_strdup_printf("%s/%d", path, ++fileno);
- rename_status = libbalsa_safe_rename(tmp, new_filename);
+ rename_status = libbalsa_safe_rename(name_used, new_filename);
g_free(new_filename);
if (rename_status != -1)
break;
@@ -1124,12 +1124,12 @@ lbm_mh_add_message(LibBalsaMailboxLocal * local,
g_set_error(err, LIBBALSA_MAILBOX_ERROR,
LIBBALSA_MAILBOX_APPEND_ERROR,
_("Message rename error"));
- unlink (tmp);
- g_free(tmp);
+ unlink (name_used);
+ g_free(name_used);
return FALSE;
}
} while (--retries > 0);
- g_free(tmp);
+ g_free(name_used);
if (retries == 0) {
g_set_error(err, LIBBALSA_MAILBOX_ERROR,
diff --git a/libbalsa/mime.c b/libbalsa/mime.c
index 5f7744a..b4a7fe0 100644
--- a/libbalsa/mime.c
+++ b/libbalsa/mime.c
@@ -1217,10 +1217,11 @@ libbalsa_text_to_html(const gchar * title, const gchar * body, const gchar * lan
gchar * html_subject;
const gchar * start = body;
gchar * html_lang;
- gchar * p;
/* set the html header, including the primary language and the title */
if (lang) {
+ gchar * p;
+
html_lang = g_strdup(lang);
if ((p = strchr(html_lang, '_')))
*p = '-';
diff --git a/libbalsa/send.c b/libbalsa/send.c
index e3e84d4..6f4b306 100644
--- a/libbalsa/send.c
+++ b/libbalsa/send.c
@@ -1234,7 +1234,7 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
} else if (g_ascii_strcasecmp(mime_type[0], "message") == 0) {
GMimeStream *stream;
GMimeParser *parser;
- GMimeMessage *mime_message;
+ GMimeMessage *mime_msg;
GError *err = NULL;
stream = libbalsa_vfs_create_stream(body->file_uri, 0, FALSE, &err);
@@ -1255,12 +1255,12 @@ libbalsa_message_create_mime_message(LibBalsaMessage *message,
}
parser = g_mime_parser_new_with_stream(stream);
g_object_unref(stream);
- mime_message = g_mime_parser_construct_message(parser, libbalsa_parser_options());
+ mime_msg = g_mime_parser_construct_message(parser, libbalsa_parser_options());
g_object_unref(parser);
mime_part =
GMIME_OBJECT(g_mime_message_part_new_with_message
- (mime_type[1], mime_message));
- g_object_unref(mime_message);
+ (mime_type[1], mime_msg));
+ g_object_unref(mime_msg);
} else {
const gchar *charset = NULL;
GMimeStream *stream;
diff --git a/src/balsa-mblist.c b/src/balsa-mblist.c
index dab9b53..ddf307e 100644
--- a/src/balsa-mblist.c
+++ b/src/balsa-mblist.c
@@ -883,7 +883,6 @@ static void
bmbl_select_mailbox(GtkTreeSelection * selection, gpointer data)
{
GdkEvent *event = gtk_get_current_event();
- GtkTreeIter iter;
GtkTreeView *tree_view =
gtk_tree_selection_get_tree_view(selection);
GtkTreeModel *model =
@@ -891,10 +890,9 @@ bmbl_select_mailbox(GtkTreeSelection * selection, gpointer data)
GtkTreePath *path;
if (!event) {
- GtkTreeModel *model;
GtkTreeIter iter;
- if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
+ if (gtk_tree_selection_get_selected(selection, NULL, &iter)) {
BalsaMailboxNode *mbnode;
LibBalsaMailbox *mailbox;
gtk_tree_model_get(model, &iter, MBNODE_COLUMN, &mbnode, -1);
@@ -937,6 +935,7 @@ bmbl_select_mailbox(GtkTreeSelection * selection, gpointer data)
if (gtk_tree_selection_path_is_selected(selection, path)) {
BalsaMailboxNode *mbnode;
+ GtkTreeIter iter;
gtk_tree_model_get_iter(model, &iter, path);
gtk_tree_model_get(model, &iter, MBNODE_COLUMN, &mbnode, -1);
diff --git a/src/balsa-message.c b/src/balsa-message.c
index 2168a0f..8af213b 100644
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@ -1716,7 +1716,7 @@ static void
balsa_part_info_free(GObject * object)
{
BalsaPartInfo * info;
- GObjectClass *parent_class;
+ GObjectClass *part_info_parent_class;
g_return_if_fail(object != NULL);
g_return_if_fail(IS_BALSA_PART_INFO(object));
@@ -1731,8 +1731,8 @@ balsa_part_info_free(GObject * object)
gtk_tree_path_free(info->path);
- parent_class = g_type_class_peek_parent(G_OBJECT_GET_CLASS(object));
- parent_class->finalize(object);
+ part_info_parent_class = g_type_class_peek_parent(G_OBJECT_GET_CLASS(object));
+ part_info_parent_class->finalize(object);
}
static void
diff --git a/src/filter-run-dialog.c b/src/filter-run-dialog.c
index 85967ef..6ee6b02 100644
--- a/src/filter-run-dialog.c
+++ b/src/filter-run-dialog.c
@@ -492,8 +492,8 @@ filters_run_dialog(LibBalsaMailbox * mbox,
}
/* We look for an existing dialog box for this mailbox */
for (lst = fr_dialogs_opened; lst; lst = g_list_next(lst)) {
- BalsaFilterRunDialog *p = lst->data;
- if (strcmp(p->mbox->url, mbox->url) == 0)
+ BalsaFilterRunDialog *dialog = lst->data;
+ if (strcmp(dialog->mbox->url, mbox->url) == 0)
break;
}
if (lst) {
diff --git a/src/main-window.c b/src/main-window.c
index 4c3d5c2..12ce465 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -95,7 +95,6 @@ GtkWidget *progress_dialog = NULL;
GtkWidget *progress_dialog_source = NULL;
GtkWidget *progress_dialog_message = NULL;
GtkWidget *progress_dialog_bar = NULL;
-GSList *list = NULL;
static int quiet_check=0;
struct check_messages_thread_info {
diff --git a/src/save-restore.c b/src/save-restore.c
index 7c7c418..bd6fce5 100644
--- a/src/save-restore.c
+++ b/src/save-restore.c
@@ -572,7 +572,7 @@ static gint
config_global_load(void)
{
gboolean def_used;
- guint tmp;
+ guint filter_mask;
static gboolean new_user = FALSE;
config_address_books_load();
@@ -677,10 +677,11 @@ config_global_load(void)
g_free(balsa_app.selected_headers);
{ /* scope */
- gchar *tmp = libbalsa_conf_get_string("SelectedHeaders="
- DEFAULT_SELECTED_HDRS);
- balsa_app.selected_headers = g_ascii_strdown(tmp, -1);
- g_free(tmp);
+ gchar *selected_headers =
+ libbalsa_conf_get_string("SelectedHeaders="
+ DEFAULT_SELECTED_HDRS);
+ balsa_app.selected_headers = g_ascii_strdown(selected_headers, -1);
+ g_free(selected_headers);
}
balsa_app.expand_tree = libbalsa_conf_get_bool("ExpandTree=false");
@@ -793,12 +794,12 @@ config_global_load(void)
balsa_app.pwindow_option = d_get_gint("ProgressWindow", WHILERETR);
/* ... deleting messages: defaults enshrined here */
- tmp = libbalsa_mailbox_get_filter(NULL);
+ filter_mask = libbalsa_mailbox_get_filter(NULL);
if (libbalsa_conf_get_bool("HideDeleted=true"))
- tmp |= (1 << 0);
+ filter_mask |= (1 << 0);
else
- tmp &= ~(1 << 0);
- libbalsa_mailbox_set_filter(NULL, tmp);
+ filter_mask &= ~(1 << 0);
+ libbalsa_mailbox_set_filter(NULL, filter_mask);
balsa_app.expunge_on_close =
libbalsa_conf_get_bool("ExpungeOnClose=true");
@@ -955,10 +956,10 @@ config_global_load(void)
passphrase = libbalsa_conf_private_get_string("ESMTPPassphrase");
if (passphrase) {
- gchar* tmp = libbalsa_rot(passphrase);
+ gchar* passphrase_rot = libbalsa_rot(passphrase);
g_free(passphrase);
- libbalsa_server_set_password(server, tmp);
- g_free(tmp);
+ libbalsa_server_set_password(server, passphrase_rot);
+ g_free(passphrase_rot);
}
/* default set to "Use TLS if possible" */
@@ -967,10 +968,10 @@ config_global_load(void)
passphrase =
libbalsa_conf_private_get_string("ESMTPCertificatePassphrase");
if (passphrase) {
- gchar* tmp = libbalsa_rot(passphrase);
+ gchar* passphrase_rot = libbalsa_rot(passphrase);
g_free(passphrase);
g_free(server->cert_passphrase);
- server->cert_passphrase = tmp;
+ server->cert_passphrase = passphrase_rot;
}
}
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 5fe661d..83a0d51 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -844,10 +844,10 @@ sw_edit_activated(GSimpleAction * action,
InternetAddressList *list =
libbalsa_address_view_get_list(bsmsg->recipient_view,
address_types[type]);
- gchar *p = internet_address_list_to_string(list, NULL, FALSE);
+ gchar *addr_string = internet_address_list_to_string(list, NULL, FALSE);
g_object_unref(list);
- fprintf(tmp, "%s %s\n", _(address_types[type]), p);
- g_free(p);
+ fprintf(tmp, "%s %s\n", _(address_types[type]), addr_string);
+ g_free(addr_string);
}
fprintf(tmp, "\n");
}
@@ -1075,7 +1075,6 @@ update_bsmsg_identity(BalsaSendmsg* bsmsg, LibBalsaIdentity* ident)
gint replace_offset = 0;
gint siglen;
- gint i = 0;
gboolean found_sig = FALSE;
gchar* old_sig;
@@ -1238,8 +1237,10 @@ update_bsmsg_identity(BalsaSendmsg* bsmsg, LibBalsaIdentity* ident)
&replace_offset, siglen - 1, new_sig);
found_sig = TRUE;
} else {
- g_free(compare_str);
- while (message_split[i]) {
+ gint i;
+
+ g_free(compare_str);
+ for (i = 0; message_split[i] != NULL; i++) {
/* put sig separator back to search */
compare_str = g_strconcat("\n-- \n", message_split[i], NULL);
@@ -1254,7 +1255,6 @@ update_bsmsg_identity(BalsaSendmsg* bsmsg, LibBalsaIdentity* ident)
replace_offset +=
g_utf8_strlen(i ? compare_str : message_split[i], -1);
g_free(compare_str);
- i++;
}
}
/* if no sig seperators found, do a slower brute force
@@ -3123,7 +3123,6 @@ scan_bodies(GtkTreeStore * bodies, GtkTreeIter * parent, LibBalsaMessageBody * b
switch (libbalsa_message_body_type(body)) {
case LIBBALSA_MESSAGE_BODY_TYPE_TEXT:
{
- gchar *mime_type;
LibBalsaHTMLType html_type;
mime_type = libbalsa_message_body_get_mime_type(body);
@@ -4030,7 +4029,7 @@ sw_broker_cb(const gchar * lang_tag,
static void
create_lang_menu(GtkWidget * parent, BalsaSendmsg * bsmsg)
{
- unsigned i;
+ guint i;
GtkWidget *langs = gtk_menu_new();
static gboolean locales_sorted = FALSE;
GSList *group = NULL;
@@ -4116,10 +4115,10 @@ create_lang_menu(GtkWidget * parent, BalsaSendmsg * bsmsg)
#else /* HAVE_GSPELL */
const gchar *lang = l->data;
#endif /* HAVE_GSPELL */
- gint i;
+ gint j;
- i = find_locale_index_by_locale(lang);
- if (i < 0 || strcmp(lang, locales[i].locale) != 0) {
+ j = find_locale_index_by_locale(lang);
+ if (j < 0 || strcmp(lang, locales[j].locale) != 0) {
GtkWidget *w;
#ifdef CAN_SEPARATE_RADIO_MENU_ITEMS
@@ -5204,32 +5203,32 @@ send_message_handler(BalsaSendmsg * bsmsg, gboolean queue_only)
* RFC2440 sign a multipart/alternative... */
GtkWidget *dialog;
gint choice;
- GString * message =
+ GString * string =
g_string_new(_("You selected OpenPGP security for this message.\n"));
if (warn_html_sign)
- message =
- g_string_append(message,
+ string =
+ g_string_append(string,
_("The message text will be sent as plain text and as "
"HTML, but only the plain part can be signed.\n"));
if (warn_mp)
- message =
- g_string_append(message,
+ string =
+ g_string_append(string,
_("The message contains attachments, which cannot be "
"signed or encrypted.\n"));
- message =
- g_string_append(message,
+ string =
+ g_string_append(string,
_("You should select MIME mode if the complete "
"message shall be protected. Do you really want to proceed?"));
dialog = gtk_message_dialog_new
(GTK_WINDOW(bsmsg->window),
GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_OK_CANCEL, "%s", message->str);
+ GTK_BUTTONS_OK_CANCEL, "%s", string->str);
#if HAVE_MACOSX_DESKTOP
libbalsa_macosx_menu_for_parent(dialog, GTK_WINDOW(bsmsg->window));
#endif
- g_string_free(message, TRUE);
+ g_string_free(string, TRUE);
choice = gtk_dialog_run(GTK_DIALOG(dialog));
gtk_widget_destroy(dialog);
if (choice != GTK_RESPONSE_OK)
@@ -6238,8 +6237,6 @@ sendmsg_window_new_from_list(LibBalsaMailbox * mailbox,
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(bsmsg->text));
for (i = 1; i < selected->len; i++) {
- LibBalsaMessage *message;
-
msgno = g_array_index(selected, guint, i);
message = libbalsa_mailbox_get_message(mailbox, msgno);
if (!message)
@@ -6930,7 +6927,7 @@ sendmsg_window_continue(LibBalsaMailbox * mailbox, guint msgno)
GtkWidget *langs =
gtk_menu_item_get_submenu(GTK_MENU_ITEM
(bsmsg->current_language_menu));
- GList *list, *children =
+ GList *children =
gtk_container_get_children(GTK_CONTAINER(langs));
set_locale(bsmsg, postpone_hdr);
for (list = children; list; list = list->next) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
