commit 1a80402ecfb6fd8381f7157cd87e8b06db6eabf7
parent b4dc5a35e5407ff6cea9f700333df196823ec798
Author: Colin Leroy <colin@colino.net>
Date: Wed, 19 Sep 2012 15:14:00 +0000
2012-09-19 [colin] 3.8.1cvs65
* src/addrindex.c
* src/editaddress.c
* src/editldap.c
* src/exporthtml.c
* src/jpilot.c
* src/procmime.c
* src/plugins/bogofilter/bogofilter_gtk.c
* src/plugins/pgpcore/prefs_gpg.c
* src/plugins/smime/smime.c
* src/plugins/spamassassin/spamassassin_gtk.c
More warning fixes, casts, useless variables and
unchecked return values
Diffstat:
13 files changed, 47 insertions(+), 55 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,18 @@
+2012-09-19 [colin] 3.8.1cvs65
+
+ * src/addrindex.c
+ * src/editaddress.c
+ * src/editldap.c
+ * src/exporthtml.c
+ * src/jpilot.c
+ * src/procmime.c
+ * src/plugins/bogofilter/bogofilter_gtk.c
+ * src/plugins/pgpcore/prefs_gpg.c
+ * src/plugins/smime/smime.c
+ * src/plugins/spamassassin/spamassassin_gtk.c
+ More warning fixes, casts, useless variables and
+ unchecked return values
+
2012-09-19 [colin] 3.8.1cvs64
* src/mainwindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4439,3 +4439,4 @@
( cvs diff -u -r 1.12.2.74 -r 1.12.2.75 src/action.c; cvs diff -u -r 1.22.2.29 -r 1.22.2.30 src/addrbook.c; cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/addrclip.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/addrcustomattr.c; cvs diff -u -r 1.60.2.150 -r 1.60.2.151 src/addressbook.c; cvs diff -u -r 1.16.2.72 -r 1.16.2.73 src/msgcache.c; cvs diff -u -r 1.96.2.248 -r 1.96.2.249 src/textview.c; cvs diff -u -r 1.43.2.130 -r 1.43.2.131 src/toolbar.c; ) > 3.8.1cvs62.patchset
( cvs diff -u -r 1.13.2.23 -r 1.13.2.24 src/addritem.c; ) > 3.8.1cvs63.patchset
( cvs diff -u -r 1.274.2.351 -r 1.274.2.352 src/mainwindow.c; cvs diff -u -r 1.105.2.176 -r 1.105.2.177 src/prefs_account.c; cvs diff -u -r 1.1.2.33 -r 1.1.2.34 src/prefs_compose_writing.c; cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/prefs_logging.c; cvs diff -u -r 1.1.2.36 -r 1.1.2.37 src/prefs_message.c; cvs diff -u -r 1.1.2.48 -r 1.1.2.49 src/prefs_msg_colors.c; cvs diff -u -r 1.1.2.47 -r 1.1.2.48 src/prefs_other.c; cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/prefs_receive.c; cvs diff -u -r 1.1.2.71 -r 1.1.2.72 src/prefs_summaries.c; cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_wrapping.c; cvs diff -u -r 1.9.2.56 -r 1.9.2.57 src/common/ssl.c; cvs diff -u -r 1.9.2.82 -r 1.9.2.83 src/gtk/gtkaspell.c; ) > 3.8.1cvs64.patchset
+( cvs diff -u -r 1.28.2.50 -r 1.28.2.51 src/addrindex.c; cvs diff -u -r 1.14.2.64 -r 1.14.2.65 src/editaddress.c; cvs diff -u -r 1.8.2.46 -r 1.8.2.47 src/editldap.c; cvs diff -u -r 1.5.2.32 -r 1.5.2.33 src/exporthtml.c; cvs diff -u -r 1.18.2.36 -r 1.18.2.37 src/jpilot.c; cvs diff -u -r 1.49.2.150 -r 1.49.2.151 src/procmime.c; cvs diff -u -r 1.1.2.43 -r 1.1.2.44 src/plugins/bogofilter/bogofilter_gtk.c; cvs diff -u -r 1.1.2.38 -r 1.1.2.39 src/plugins/pgpcore/prefs_gpg.c; cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/plugins/smime/smime.c; cvs diff -u -r 1.23.2.60 -r 1.23.2.61 src/plugins/spamassassin/spamassassin_gtk.c; ) > 3.8.1cvs65.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=64
+EXTRA_VERSION=65
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/addrindex.c b/src/addrindex.c
@@ -1580,7 +1580,7 @@ static void addrindex_read_index( AddressIndex *addrIndex, XMLFile *file ) {
addrIndex->loadedFlag = FALSE;
for (;;) {
rc = xml_parse_next_tag( file );
- if( file->level == 0 ) return;
+ if( rc < 0 || file->level == 0 ) return;
xtag = xml_get_current_tag( file );
@@ -2015,21 +2015,13 @@ static void addrindex_add_obj( XMLFile *file, AddressCvtNode *node ) {
*/
static void addrindex_consume_tree( XMLFile *file ) {
guint prev_level;
- gchar *element;
- GList *attr;
- XMLTag *xtag;
for (;;) {
prev_level = file->level;
xml_parse_next_tag( file );
- if (file->level < prev_level) return;
+ if (file->level < prev_level)
+ return;
- xtag = xml_get_current_tag( file );
- /* g_print( "tag : %s\n", xtag->tag ); */
- element = xml_get_element( file );
- attr = xml_get_current_tag_attr( file );
- /* show_attribs( attr ); */
- /* g_print( "\ttag value : %s :\n", element ); */
addrindex_consume_tree( file );
}
}
@@ -2197,8 +2189,6 @@ static gboolean addrindex_process_book( AddressIndex *addrIndex, XMLFile *file,
*/
static void addrindex_convert_tree( AddressIndex *addrIndex, XMLFile *file ) {
guint prev_level;
- gchar *element;
- GList *attr;
XMLTag *xtag;
/* Process file */
@@ -2225,10 +2215,6 @@ static void addrindex_convert_tree( AddressIndex *addrIndex, XMLFile *file ) {
}
return;
}
- element = xml_get_element( file );
- attr = xml_get_current_tag_attr( file );
- /* show_attribs( attr ); */
- /* g_print( "\ttag value : %s :\n", element ); */
addrindex_consume_tree( file );
}
}
@@ -2791,7 +2777,6 @@ gboolean addrindex_start_search( const gint queryID ) {
*/
void addrindex_remove_results( AddressDataSource *ds, ItemFolder *folder ) {
AddrBookBase *adbase;
- AddressCache *cache;
gint queryID = 0;
/* g_print( "addrindex_remove_results/start\n" ); */
@@ -2801,7 +2786,6 @@ void addrindex_remove_results( AddressDataSource *ds, ItemFolder *folder ) {
/* g_print( "folder name ::%s::\n", ADDRITEM_NAME(folder) ); */
adbase = ( AddrBookBase * ) ds->rawDataSource;
if( adbase == NULL ) return;
- cache = adbase->addressCache;
/* Hide folder to prevent re-display */
addritem_folder_set_hidden( folder, TRUE );
diff --git a/src/editaddress.c b/src/editaddress.c
@@ -884,7 +884,6 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
GtkWidget *entry_nn;
const gchar *locale;
gint top = 0;
- GtkActionGroup *action_group;
vbox = gtk_vbox_new( FALSE, 20 );
hbox = gtk_hbox_new( FALSE, 8 );
@@ -892,7 +891,7 @@ static void addressbook_edit_person_page_basic( gint pageNum, gchar *pageLbl ) {
gtk_widget_show( vbox );
if (!editaddr_popup_menu) {
- action_group = cm_menu_create_action_group("EditAddressPopup", editaddr_popup_entries,
+ cm_menu_create_action_group("EditAddressPopup", editaddr_popup_entries,
G_N_ELEMENTS(editaddr_popup_entries), (gpointer)NULL);
MENUITEM_ADDUI("/Menus", "EditAddressPopup", "EditAddressPopup", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI("/Menus/EditAddressPopup", "SetPicture", "EditAddressPopup/SetPicture", GTK_UI_MANAGER_MENUITEM)
diff --git a/src/editldap.c b/src/editldap.c
@@ -460,7 +460,7 @@ static void addressbook_edit_ldap_page_basic( gint pageNum, gchar *pageLbl ) {
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
hbox_spin = gtk_hbox_new (FALSE, 8);
- spinbtn_port_adj = gtk_adjustment_new (389, 1, 65535, 1, 1000, 0);
+ spinbtn_port_adj = GTK_ADJUSTMENT(gtk_adjustment_new (389, 1, 65535, 1, 1000, 0));
spinbtn_port = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_port_adj), 1, 0);
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_port, TRUE, FALSE, 0);
gtk_widget_set_size_request (spinbtn_port, 64, -1);
@@ -602,8 +602,8 @@ static void addressbook_edit_ldap_page_search( gint pageNum, gchar *pageLbl ) {
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
hbox_spin = gtk_hbox_new (FALSE, 8);
- spinbtn_queryage_adj = gtk_adjustment_new(
- LDAPCTL_DFL_QUERY_AGE, 1, LDAPCTL_MAX_QUERY_AGE, 10, 1000, 0 );
+ spinbtn_queryage_adj = GTK_ADJUSTMENT(gtk_adjustment_new(
+ LDAPCTL_DFL_QUERY_AGE, 1, LDAPCTL_MAX_QUERY_AGE, 10, 1000, 0 ));
spinbtn_queryage = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_queryage_adj), 1, 0);
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_queryage, FALSE, FALSE, 0);
gtk_widget_set_size_request (spinbtn_queryage, 64, -1);
@@ -738,7 +738,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
hbox_spin = gtk_hbox_new (FALSE, 8);
- spinbtn_timeout_adj = gtk_adjustment_new (0, 0, 300, 1, 10, 0);
+ spinbtn_timeout_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 300, 1, 10, 0));
spinbtn_timeout = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_timeout_adj), 1, 0);
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_timeout, FALSE, FALSE, 0);
gtk_widget_set_size_request (spinbtn_timeout, 64, -1);
@@ -756,7 +756,7 @@ static void addressbook_edit_ldap_page_extended( gint pageNum, gchar *pageLbl )
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
hbox_spin = gtk_hbox_new (FALSE, 8);
- spinbtn_maxentry_adj = gtk_adjustment_new (0, 0, 500, 1, 10, 0);
+ spinbtn_maxentry_adj = GTK_ADJUSTMENT(gtk_adjustment_new (0, 0, 500, 1, 10, 0));
spinbtn_maxentry = gtk_spin_button_new(GTK_ADJUSTMENT (spinbtn_maxentry_adj), 1, 0);
gtk_box_pack_start (GTK_BOX (hbox_spin), spinbtn_maxentry, FALSE, FALSE, 0);
gtk_widget_set_size_request (spinbtn_maxentry, 64, -1);
diff --git a/src/exporthtml.c b/src/exporthtml.c
@@ -874,7 +874,7 @@ static void exporthtml_fmt_folder(
const GList *node;
GList *listHeir, *list;
const gchar *name;
- gboolean ret1, ret2;
+ gboolean ret1;
name = ADDRITEM_NAME( folder );
if( name ) {
@@ -889,7 +889,7 @@ static void exporthtml_fmt_folder(
}
ret1 = exporthtml_fmt_person( ctl, stream, folder );
- ret2 = exporthtml_fmt_group( ctl, stream, folder, ret1 );
+ exporthtml_fmt_group( ctl, stream, folder, ret1 );
node = list = exporthtml_sort_name( folder->listFolder );
while( node ) {
diff --git a/src/jpilot.c b/src/jpilot.c
@@ -560,6 +560,9 @@ static int jpilot_get_info_size( FILE *in, int *size ) {
}
r = fread(&rh, sizeof(record_header), 1, in);
+ if (r < 1)
+ return MGU_ERROR_READ;
+
offset = ((rh.Offset[0]*256+rh.Offset[1])*256+rh.Offset[2])*256+rh.Offset[3];
*size=offset - dbh.app_info_offset;
@@ -676,6 +679,8 @@ static int read_header(FILE *pc_in, PC3RecordHeader *header) {
unsigned char packed_header[256];
int num;
+ memset(header, 0, sizeof(PC3RecordHeader));
+
num = fread(&l, sizeof(l), 1, pc_in);
if (feof(pc_in)) {
return -1;
@@ -718,12 +723,12 @@ static gint jpilot_read_next_pc( FILE *in, buf_rec *br ) {
}
num = read_header( in, &header );
if( num < 1 ) {
- if( ferror( in ) ) {
+ if( ferror( in ) )
return MGU_ERROR_READ;
- }
- if( feof( in ) ) {
+ else if( feof( in ) )
return MGU_EOF;
- }
+ else
+ return -1;
}
rec_len = header.rec_len;
record = malloc( rec_len );
@@ -1089,7 +1094,6 @@ static void jpilot_load_address(
gchar *labelEntry;
GList *node;
gchar* extID;
- struct AddressAppInfo *ai;
gchar **firstName = NULL;
gchar **lastName = NULL;
#if (PILOT_LINK_MAJOR > 11)
@@ -1167,19 +1171,9 @@ static void jpilot_load_address(
g_free( extID );
extID = NULL;
- /* Pointer to address metadata. */
- ai = & pilotFile->addrInfo;
-
/* Add entry for each email address listed under phone labels. */
indPhoneLbl = addr.phoneLabel;
for( k = 0; k < JPILOT_NUM_ADDR_PHONE; k++ ) {
- gint ind;
-
- ind = indPhoneLbl[k];
- /*
- * g_print( "%d : %d : %20s : %s\n", k, ind,
- * ai->phoneLabels[ind], addrEnt[3+k] );
- */
if( indPhoneLbl[k] == IND_PHONE_EMAIL ) {
labelEntry = addrEnt[ OFFSET_PHONE_LABEL + k ];
jpilot_parse_label( pilotFile, labelEntry, person );
diff --git a/src/plugins/bogofilter/bogofilter_gtk.c b/src/plugins/bogofilter/bogofilter_gtk.c
@@ -159,7 +159,7 @@ static void bogofilter_create_widget_func(PrefsPage * _page,
gtk_widget_show(max_size_label);
gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_label, FALSE, FALSE, 0);
- max_size_spinbtn_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 0);
+ max_size_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(250, 0, 10000, 10, 10, 0));
max_size_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_spinbtn_adj), 1, 0);
gtk_widget_show(max_size_spinbtn);
gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_spinbtn, FALSE, FALSE, 0);
diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
@@ -128,7 +128,7 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
gtk_box_pack_start (GTK_BOX (hbox1), label_expire1, FALSE, FALSE, 0);
spinbtn_store_passphrase_adj =
- gtk_adjustment_new(1, 0, 1440, 1, 10, 0);
+ GTK_ADJUSTMENT(gtk_adjustment_new(1, 0, 1440, 1, 10, 0));
spinbtn_store_passphrase =
gtk_spin_button_new(GTK_ADJUSTMENT
(spinbtn_store_passphrase_adj), 1, 0);
diff --git a/src/plugins/smime/smime.c b/src/plugins/smime/smime.c
@@ -266,8 +266,7 @@ static gint smime_check_signature(MimeInfo *mimeinfo)
if (textstr && len) {
gchar *tmp_file = get_tmp_file();
MimeInfo *newinfo = NULL, *decinfo = NULL, *parentinfo = NULL;
- gint childnumber = 0;
-
+
str_write_to_file(textstr, tmp_file);
newinfo = procmime_scan_file(tmp_file);
decinfo = g_node_first_child(newinfo->node) != NULL ?
@@ -280,7 +279,7 @@ static gint smime_check_signature(MimeInfo *mimeinfo)
procmime_mimeinfo_free_all(newinfo);
decinfo->tmp = TRUE;
parentinfo = procmime_mimeinfo_parent(mimeinfo);
- childnumber = g_node_child_index(parentinfo->node, mimeinfo);
+
if (parentinfo->type == MIMETYPE_MESSAGE &&
!strcmp(parentinfo->subtype, "rfc822")) {
procmime_decode_content(parentinfo);
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -338,7 +338,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
gtk_widget_show(spamd_colon_label);
gtk_box_pack_start(GTK_BOX(hbox_spamd), spamd_colon_label, FALSE, FALSE, 0);
- spamd_port_spinbtn_adj = gtk_adjustment_new(783, 1, 65535, 1, 10, 0);
+ spamd_port_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(783, 1, 65535, 1, 10, 0));
spamd_port_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(spamd_port_spinbtn_adj), 1, 0);
gtk_widget_show(spamd_port_spinbtn);
gtk_box_pack_start(GTK_BOX(hbox_spamd), spamd_port_spinbtn, FALSE, FALSE, 0);
@@ -359,7 +359,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
gtk_widget_show(max_size_label);
gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_label, FALSE, FALSE, 0);
- max_size_spinbtn_adj = gtk_adjustment_new(250, 0, 10000, 10, 10, 0);
+ max_size_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(250, 0, 10000, 10, 10, 0));
max_size_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_spinbtn_adj), 1, 0);
gtk_widget_show(max_size_spinbtn);
gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_spinbtn, FALSE, FALSE, 0);
@@ -379,7 +379,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
gtk_widget_show(timeout_label);
gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_label, FALSE, FALSE, 0);
- timeout_spinbtn_adj = gtk_adjustment_new(60, 0, 10000, 10, 10, 0);
+ timeout_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(60, 0, 10000, 10, 10, 0));
timeout_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(timeout_spinbtn_adj), 1, 0);
gtk_widget_show(timeout_spinbtn);
gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_spinbtn, FALSE, FALSE, 0);
diff --git a/src/procmime.c b/src/procmime.c
@@ -1701,15 +1701,15 @@ static void parse_parameters(const gchar *parameters, GHashTable *table)
tmp[0] = '\0';
if ((tmp[1] == '0') && (tmp[2] == '\0') &&
- (g_slist_find_custom(concatlist, down_attr, g_strcmp0) == NULL))
+ (g_slist_find_custom(concatlist, down_attr, (GCompareFunc)g_strcmp0) == NULL))
concatlist = g_slist_prepend(concatlist, g_strdup(tmpattr));
- if (convert && (g_slist_find_custom(convlist, tmpattr, g_strcmp0) == NULL))
+ if (convert && (g_slist_find_custom(convlist, tmpattr, (GCompareFunc)g_strcmp0) == NULL))
convlist = g_slist_prepend(convlist, g_strdup(tmpattr));
g_free(tmpattr);
} else if (convert) {
- if (g_slist_find_custom(convlist, down_attr, g_strcmp0) == NULL)
+ if (g_slist_find_custom(convlist, down_attr, (GCompareFunc)g_strcmp0) == NULL)
convlist = g_slist_prepend(convlist, g_strdup(down_attr));
}
