Coverity fixes

[claws.git] / src / addrindex.c

diff --git a/src/addrindex.c b/src/addrindex.c
index 41ea423e0469a0ad9e83b900f3e6ff3c00699eb7..9cf4e541cc33eb0e117747db854659086efb842a 100644 (file)
--- a/src/addrindex.c
+++ b/src/addrindex.c
@@ -1572,7 +1572,6 @@ static int addrindex_write_ldap( FILE *fp, AddressDataSource *ds, gint lvl ) {
  * \param  file Address index file.
  */
 static void addrindex_read_index( AddressIndex *addrIndex, XMLFile *file ) {
-       guint prev_level;
        XMLTag *xtag;
        AddressInterface *iface = NULL, *dsIFace = NULL;
        AddressDataSource *ds;
@@ -1580,9 +1579,8 @@ static void addrindex_read_index( AddressIndex *addrIndex, XMLFile *file ) {
 
        addrIndex->loadedFlag = FALSE;
        for (;;) {
-               prev_level = file->level;
                rc = xml_parse_next_tag( file );
-               if( file->level == 0 ) return;
+               if( rc < 0 || file->level == 0 ) return;
 
                xtag = xml_get_current_tag( file );
 
@@ -2006,8 +2004,7 @@ static void addrindex_add_obj( XMLFile *file, AddressCvtNode *node ) {
                        node->list = g_list_append( node->list, newNode );
                }
                else {
-                       /* g_print( "invalid: !!! \n" ); */
-                       attr = xml_get_current_tag_attr( file );
+                       g_warning("Invalid tag");
                }
        }
 }
@@ -2017,21 +2014,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 );
        }
 }
@@ -2199,8 +2188,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 */
@@ -2227,10 +2214,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 );
        }
 }
@@ -2793,7 +2776,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" ); */
@@ -2803,7 +2785,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 );