* major code cleanup (part 2)

        - unused variables removed
        - unused functions removed
        - uninitialized variables checked
        - missing return statements added
        - missing function return types added
        - added parentheses around assignment
	  when suggested by gcc

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 3b36037a7d78eb21978f2974bdea0948b3ae2835..e0a06280ce076787c0545d10558ae22155108069 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,15 @@
+2002-09-29 [christoph] 0.8.3claws34
+
+       * major code cleanup (part 2)
+       
+               - unused variables removed
+               - unused functions removed
+               - uninitialized variables checked
+               - missing return statements added
+               - missing function return types added
+               - added parentheses around assignment
+                 when suggested by gcc
+
 2002-09-29 [alfons]    0.8.3claws33
 
        * src/logwindow.c
@@ -15,9 +27,9 @@
 2002-09-27 [christoph] 0.8.3claws31
 
        * doc-src/readme.txt
-       * doc-src/rfc1806.txt
-       * doc-src/rfc2183.txt
-       * doc-src/rfc2980.txt
+       * doc-src/rfc1806.txt   ** REMOVED **
+       * doc-src/rfc2183.txt   ** NEW FILE **
+       * doc-src/rfc2980.txt   ** NEW FILE **
                update rfcs
 
 2002-09-27 [melvin]    0.8.3claws30

diff --git a/configure.in b/configure.in
index e4c85840f6f3edc49716c2d8de77f2780f9d83a5..4b4d2bc2d55d62b0d69d12117fdea42cc90d520a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ MINOR_VERSION=8
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws33
+EXTRA_VERSION=claws34
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/account.c b/src/account.c
index ab54d7c54bfcb33b04957fb8023efbc17b35d822..bdd2ad0865ecd765de55ccd0397c3aabfd4f1033 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -669,6 +669,8 @@ static gboolean account_delete_references_func(GNode *node, gpointer data)
        item->prefs->enable_default_account = FALSE;
        item->prefs->default_account = 0;
        prefs_folder_item_save_config(item);
+
+       return FALSE;
 }
 
 static void account_delete(void)

diff --git a/src/addrbook.c b/src/addrbook.c
index 89e4506b2864196ab7fc18a8ec9739b5f19ccf7c..3fbef002e8ca39d8117075fa8b538bdae91e7d84 100644 (file)
--- a/src/addrbook.c
+++ b/src/addrbook.c
@@ -1366,22 +1366,6 @@ ItemPerson *addrbook_add_address_list( AddressBookFile *book, ItemFolder *folder
        return person;
 }
 
-/*
-* Load hash table visitor function.
-*/
-static void addrbook_load_hash_table_email_vis( gpointer key, gpointer value, gpointer data ) {
-       AddrItemObject *obj = ( AddrItemObject * ) value;
-
-       if( ADDRITEM_TYPE(obj) == ITEMTYPE_EMAIL ) {
-               GHashTable *table = ( GHashTable * ) data;
-               gchar *newKey = g_strdup( key );
-               ItemEMail *email = ( ItemEMail * ) obj;
-               if( ! g_hash_table_lookup( table, newKey ) ) {
-                       g_hash_table_insert( table, newKey, email );
-               }
-       }
-}
-
 /*
 * Build available email list visitor function.
 */

diff --git a/src/addrclip.c b/src/addrclip.c
index 4fd7896374680568eaf9069a6435cea24b8472e6..32d70490a1db30c9038b2225a2a739730a24d331 100644 (file)
--- a/src/addrclip.c
+++ b/src/addrclip.c
@@ -161,13 +161,6 @@ void addrclip_add_item(
        }
 }
 
-static void addrclip_print( AddrSelectItem *item, FILE *stream ) {
-       fprintf( stream, "Select Record\n" );
-       fprintf( stream, "obj type: %d\n", item->objectType );
-       fprintf( stream, "     uid: %s\n", item->uid );
-       fprintf( stream, "---\n" );
-}
-
 /*
 * Show clipboard contents.
 * Enter: clipBoard Clipboard.
@@ -284,79 +277,6 @@ static GList *addrclip_cache_add_person(
        return copyList;
 }
 
-/*
- * Paste unattached email into cache.
- * Enter: cache    Address cache to paste into.
- *        folder   Folder to store
- *        email    EMail to add.
- *        copyList List of email addresses pasted.
- * Return: Update list of email addresses pasted.
- */
-static GList *addrclip_cache_add_email(
-       AddressCache *cache, ItemFolder *folder, ItemEMail *email,
-       GList *copyList )
-{
-       ItemPerson *newPerson;
-       ItemEMail *newEMail;
-       AddrClip_EMail *em;
-
-       /* Create a person */
-       newPerson = addritem_create_item_person();
-       addritem_person_set_common_name( newPerson, "" );
-       addrcache_id_person( cache, newPerson );
-       addrcache_folder_add_person( cache, folder, newPerson );
-
-       /* Copy email addresses */
-       newEMail = addritem_copy_item_email( email );
-       addrcache_id_email( cache, newEMail );
-       addrcache_person_add_email( cache, newPerson, newEMail );
-
-       /* Take a copy of the original */
-       em = g_new0( AddrClip_EMail, 1 );
-       em->original = email;
-       em->copy = newEMail;
-       copyList = g_list_append( copyList, em );
-
-       return copyList;
-}
-
-/*
- * Test whether specified E-Mail address object is already in clipboard and
- * owned by an ItemPerson objects.
- * Enter: email  E-Mail to test.
- * Return: TRUE if duplicate found.
- */
-static gboolean addrclip_test_email(
-       AddressClipboard *clipBoard, ItemEMail *testEMail )
-{
-       ItemPerson *person;
-       ItemEMail *email;
-       GList *node, *nodeMail;
-       AddrSelectItem *item;
-       AddrItemObject *aio;
-       AddressCache *cache;
-
-       node = clipBoard->objectList;
-       while( node ) {
-               item = node->data;
-               cache = addrindex_get_cache( clipBoard->addressIndex, item->cacheID );
-               aio = addrcache_get_object( cache, item->uid );
-               if( aio ) {
-                       if( ADDRITEM_TYPE(aio) == ITEMTYPE_PERSON ) {
-                               person = ( ItemPerson * ) aio;
-                               nodeMail = person->listEMail;
-                               while( nodeMail ) {
-                                       email = nodeMail->data;
-                                       if( email == testEMail ) return TRUE;
-                                       nodeMail = g_list_next( nodeMail );
-                               }
-                       }
-               }
-               node = g_list_next( node );
-       }
-       return FALSE;
-}
-
 /*
  * Search for new email record in copied email list.
  * Enter: copyList  List of copied email address mappings.
@@ -973,7 +893,7 @@ static gint addrclip_person_move_email(
        GList *node;
 
        cnt = 0;
-       while( node = fromPerson->listEMail ) {
+       while( (node = fromPerson->listEMail) != NULL ) {
                ItemEMail *email;
 
                email = node->data;

diff --git a/src/addressbook.c b/src/addressbook.c
index 23e53c006c9ae7bb0602587ae49862f1cf4cdcb6..ab55463821872dc3d5ee449c7724103e69f2578f 100644 (file)
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -3304,13 +3304,13 @@ static void addressbook_lup_clicked( GtkButton *button, gpointer data ) {
 ItemObjectType addressbook_type2item( AddressObjectType abType ) {
        ItemObjectType ioType;
 
-       ioType = ITEMTYPE_NONE;
        switch( abType ) {
                case ADDR_ITEM_PERSON: ioType = ITEMTYPE_PERSON;     break;
                case ADDR_ITEM_EMAIL:  ioType = ITEMTYPE_EMAIL;      break;
                case ADDR_ITEM_FOLDER: ioType = ITEMTYPE_FOLDER;     break;
                case ADDR_ITEM_GROUP:  ioType = ITEMTYPE_GROUP;      break;
                case ADDR_DATASOURCE:  ioType = ITEMTYPE_DATASOURCE; break;
+               default:               ioType = ITEMTYPE_NONE;       break;
        }
        return ioType;
 }

diff --git a/src/compose.c b/src/compose.c
index 40619ba5153f00a17aa39e9adeed7b84f7338a70..10a4052682ceee110219e1c3c3cef6814e1f51fe 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -3752,6 +3752,9 @@ static void compose_write_attach(Compose *compose, FILE *fp)
                                fputc('\n', fp);
                        }
                        break;
+               default:
+                       debug_print("Tried to write attachment in unsupported encoding type\n");
+                       break;
                }
 
                fclose(attach_fp);

diff --git a/src/crash.c b/src/crash.c
index 134e5727cf54bdb6acf1f2d5650d7a651bad44ce..8efa1b5ab50ec8596d6834673298400762f8f3f0 100644 (file)
--- a/src/crash.c
+++ b/src/crash.c
@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <time.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 #include <errno.h>
 #include <fcntl.h>
@@ -62,7 +64,7 @@
 
 static GtkWidget       *crash_dialog_show              (const gchar *text, 
                                                         const gchar *debug_output);
-static gboolean                 crash_create_debugger_file     (void);
+static void             crash_create_debugger_file     (void);
 static void             crash_save_crash_log           (GtkButton *, const gchar *);
 static void             crash_create_bug_report        (GtkButton *, const gchar *);
 static void             crash_debug                    (unsigned long crash_pid, 
@@ -171,9 +173,6 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
        GtkWidget *button3;
        GtkWidget *button4;
        GtkWidget *button5;
-       GtkWidget *pixwid;
-       GdkPixmap *pix;
-       GdkBitmap *msk;
        gchar     *crash_report;
 
        window1 = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -279,7 +278,7 @@ static GtkWidget *crash_dialog_show(const gchar *text, const gchar *debug_output
  *             all the other options (creating temp files) looked too 
  *             convoluted.
  */
-static gboolean crash_create_debugger_file(void)
+static void crash_create_debugger_file(void)
 {
        gchar *filespec = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, DEBUGGERRC, NULL);
        

diff --git a/src/enriched.c b/src/enriched.c
index e387ee550ef9fad3a246366164863129440dccda..ded41258e35b93c4654aa1c37852342486f60503 100644 (file)
--- a/src/enriched.c
+++ b/src/enriched.c
@@ -32,9 +32,6 @@
 static ERTFState ertf_read_line                (ERTFParser     *parser);
 static void ertf_append_char           (ERTFParser     *parser,
                                         gchar           ch);
-static void ertf_append_str            (ERTFParser     *parser,
-                                        const gchar    *str,
-                                        gint            len);
 
 static ERTFState ertf_parse_tag                (ERTFParser     *parser);
 static void ertf_get_parenthesis       (ERTFParser     *parser, 
@@ -166,33 +163,6 @@ static void ertf_append_char(ERTFParser *parser, gchar ch)
                parser->newline = FALSE;
 }
 
-static void ertf_append_str(ERTFParser *parser, const gchar *str, gint len)
-{
-       GString *string = parser->str;
-
-       if (!parser->pre && parser->space) {
-               g_string_append_c(string, ' ');
-               parser->space = FALSE;
-       }
-
-       if (len == 0) return;
-       if (len < 0)
-               g_string_append(string, str);
-       else {
-               gchar *s;
-               Xstrndup_a(s, str, len, return);
-               g_string_append(string, s);
-       }
-
-       parser->empty_line = FALSE;
-       if (string->len > 0 && string->str[string->len - 1] == '\n') {
-               parser->newline = TRUE;
-               if (string->len > 1 && string->str[string->len - 2] == '\n')
-                       parser->empty_line = TRUE;
-       } else
-               parser->newline = FALSE;
-}
-
 static ERTFState ertf_parse_tag(ERTFParser *parser)
 {
        gchar buf[ERTFBUFSIZE];

diff --git a/src/exporthtml.c b/src/exporthtml.c
index 7f7a1066d5c51e8b72accc427b8b20e8e496cf51..08915d441fab7b4f6d0f7963f30015a7a55ed0da 100644 (file)
--- a/src/exporthtml.c
+++ b/src/exporthtml.c
@@ -1019,7 +1019,7 @@ void exporthtml_process(
 
        tt = time( NULL );
        fprintf( htmlFile, "<p>%s</p>\n", ctime( &tt ) );
-       fprintf( htmlFile, "<hr width=\"100\%\"></hr>\n" );
+       fprintf( htmlFile, "<hr width=\"100%%\"></hr>\n" );
 
        fprintf( htmlFile, "</body>\n" );
        fprintf( htmlFile, "</html>\n" );

diff --git a/src/filtering.c b/src/filtering.c
index 01a03f7a274f6b6f818ba8557b90663b8e358a4a..e35c78029fe6106e66dd25f8b5cefe792294cd15 100644 (file)
--- a/src/filtering.c
+++ b/src/filtering.c
@@ -258,8 +258,9 @@ static gboolean filteringaction_apply(FilteringAction * action, MsgInfo * info,
                return TRUE;
 
        default:
-               return FALSE;
+               break;
        }
+       return FALSE;
 }
 
 static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *info)
@@ -271,7 +272,6 @@ static gboolean filtering_apply_rule(FilteringProp *filtering, MsgInfo *info,
                                     GHashTable *foldertable)
 {
        gboolean result;
-       gchar    actionstr;
        gchar    buf[50];
 
        if (FALSE == (result = filteringaction_apply(filtering->action, info, foldertable))) {

diff --git a/src/folder.c b/src/folder.c
index 56f62db9e843a0f7175724a5e7764a5f8fb4eaf4..71a780e8ff1e176bc05ceed0d3f04be707ff3d5d 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -429,6 +429,8 @@ gboolean folder_scan_tree_func(GNode *node, gpointer data)
        FolderItem *item = (FolderItem *)node->data;
        
        folder_item_restore_persist_prefs(item, pptable);
+
+       return FALSE;
 }
 
 void folder_scan_tree(Folder *folder)
@@ -790,33 +792,35 @@ gchar *folder_get_path(Folder *folder)
 
        g_return_val_if_fail(folder != NULL, NULL);
 
-       if (FOLDER_TYPE(folder) == F_MH)
-               path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
-       else if (FOLDER_TYPE(folder) == F_MBOX) {
-               path = mbox_get_virtual_path(folder);
-               if (path == NULL)
-                       return NULL;
-               path = g_strconcat(get_mbox_cache_dir(),
-                                         G_DIR_SEPARATOR_S, path, NULL);
-               return path;
-       }
-       else if (FOLDER_TYPE(folder) == F_IMAP) {
-               g_return_val_if_fail(folder->account != NULL, NULL);
-               path = g_strconcat(get_imap_cache_dir(),
-                                  G_DIR_SEPARATOR_S,
-                                  folder->account->recv_server,
-                                  G_DIR_SEPARATOR_S,
-                                  folder->account->userid,
-                                  NULL);
-       } else if (FOLDER_TYPE(folder) == F_NEWS) {
-               g_return_val_if_fail(folder->account != NULL, NULL);
-               path = g_strconcat(get_news_cache_dir(),
-                                  G_DIR_SEPARATOR_S,
-                                  folder->account->nntp_server,
-                                  NULL);
-       } else
-               path = NULL;
+       switch(FOLDER_TYPE(folder)) {
+
+               case F_MH:
+                       path = g_strdup(LOCAL_FOLDER(folder)->rootpath);
+                       break;
+
+               case F_IMAP:
+                       g_return_val_if_fail(folder->account != NULL, NULL);
+                       path = g_strconcat(get_imap_cache_dir(),
+                                          G_DIR_SEPARATOR_S,
+                                          folder->account->recv_server,
+                                          G_DIR_SEPARATOR_S,
+                                          folder->account->userid,
+                                          NULL);
+                       break;
+
+               case F_NEWS:
+                       g_return_val_if_fail(folder->account != NULL, NULL);
+                       path = g_strconcat(get_news_cache_dir(),
+                                          G_DIR_SEPARATOR_S,
+                                          folder->account->nntp_server,
+                                          NULL);
+                       break;
 
+               default:
+                       path = NULL;
+                       break;
+       }
+       
        return path;
 }
 
@@ -827,26 +831,37 @@ gchar *folder_item_get_path(FolderItem *item)
 
        g_return_val_if_fail(item != NULL, NULL);
 
-       folder_path = folder_get_path(item->folder);
-       g_return_val_if_fail(folder_path != NULL, NULL);
+       if(FOLDER_TYPE(item->folder) != F_MBOX) {
+               folder_path = folder_get_path(item->folder);
+               g_return_val_if_fail(folder_path != NULL, NULL);
 
-       if (folder_path[0] == G_DIR_SEPARATOR) {
-               if (item->path)
-                       path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
-                                          item->path, NULL);
-               else
-                       path = g_strdup(folder_path);
+               if (folder_path[0] == G_DIR_SEPARATOR) {
+                       if (item->path)
+                               path = g_strconcat(folder_path, G_DIR_SEPARATOR_S,
+                                                  item->path, NULL);
+                       else
+                               path = g_strdup(folder_path);
+               } else {
+                       if (item->path)
+                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                                  folder_path, G_DIR_SEPARATOR_S,
+                                                  item->path, NULL);
+                       else
+                               path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
+                                                  folder_path, NULL);
+               }
+
+               g_free(folder_path);
        } else {
-               if (item->path)
-                       path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                          folder_path, G_DIR_SEPARATOR_S,
-                                          item->path, NULL);
-               else
-                       path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S,
-                                          folder_path, NULL);
-       }
+               gchar *itempath;
 
-       g_free(folder_path);
+               itempath = mbox_get_virtual_path(item);
+               if (itempath == NULL)
+                       return NULL;
+               path = g_strconcat(get_mbox_cache_dir(),
+                                         G_DIR_SEPARATOR_S, itempath, NULL);
+               g_free(itempath);
+       }
        return path;
 }
 

diff --git a/src/gtksctree.c b/src/gtksctree.c
index 5b216e0447517491a8b05906e7732db7c956ca05..49145180d64146c67514ffc5f3c98471f796d547 100644 (file)
--- a/src/gtksctree.c
+++ b/src/gtksctree.c
@@ -40,7 +40,6 @@ static void gtk_sctree_collapse (GtkCTree *ctree, GtkCTreeNode *node);
        
 static void tree_sort (GtkCTree *ctree, GtkCTreeNode  *node, gpointer data);
 void gtk_sctree_sort_node (GtkCTree *ctree, GtkCTreeNode *node);
-static void real_sort_list (GtkCList *clist);
 void gtk_sctree_sort_recursive (GtkCTree *ctree, GtkCTreeNode *node);
 
 static void gtk_ctree_link (GtkCTree *ctree,
@@ -719,12 +718,6 @@ gtk_sctree_sort_recursive (GtkCTree     *ctree,
        gtk_clist_thaw (clist);
 }
 
-static void
-real_sort_list (GtkCList *clist)
-{
-       gtk_sctree_sort_recursive (GTK_CTREE (clist), NULL);
-}
-
 void
 gtk_sctree_sort_node (GtkCTree     *ctree, 
                     GtkCTreeNode *node)

diff --git a/src/gtkshruler.c b/src/gtkshruler.c
index 0cc442d6d3e9229fe2b5a24ffa7c6ffb449d8c67..091c1907ed561d9e5115adececf8b087296ad815 100644 (file)
--- a/src/gtkshruler.c
+++ b/src/gtkshruler.c
@@ -43,8 +43,6 @@
 
 static void gtk_shruler_class_init     (GtkSHRulerClass *klass);
 static void gtk_shruler_init           (GtkSHRuler      *hruler);
-static gint gtk_shruler_motion_notify  (GtkWidget       *widget,
-                                        GdkEventMotion  *event);
 static void gtk_shruler_draw_ticks     (GtkRuler        *ruler);
 #if 0
 static void gtk_shruler_draw_pos       (GtkRuler        *ruler);

diff --git a/src/inc.c b/src/inc.c
index f39bc5aa50a6c77262accf7a2e1267cd46952fec..673de66e126e49f658dee7adbc62c48fbf67d1f4 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -270,6 +270,9 @@ static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
        case A_LOCAL:
                inc_spool_account(account);
                return 1;
+
+       default:
+               break;
        }
        return 0;
 }

diff --git a/src/mainwindow.c b/src/mainwindow.c
index be48271cd0c02e5b1ef338fb3371bc0c3618d644..aa314ace52afe275d0de785bad4cbdac7a19014f 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -455,9 +455,6 @@ static void create_filter_cb         (MainWindow    *mainwin,
 static void prefs_common_open_cb       (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
-static void prefs_filter_open_cb       (MainWindow     *mainwin,
-                                        guint           action,
-                                        GtkWidget      *widget);
 static void prefs_template_open_cb     (MainWindow     *mainwin,
                                         guint           action,
                                         GtkWidget      *widget);
@@ -3445,12 +3442,6 @@ static void prefs_common_open_cb(MainWindow *mainwin, guint action,
        prefs_common_open();
 }
 
-static void prefs_filter_open_cb(MainWindow *mainwin, guint action,
-                                GtkWidget *widget)
-{
-       prefs_filter_open(NULL, NULL);
-}
-
 static void prefs_scoring_open_cb(MainWindow *mainwin, guint action,
                                  GtkWidget *widget)
 {

diff --git a/src/matcher.c b/src/matcher.c
index 3ee7d22aaab6911c785c8d49e0998363545e93eb..b9288ce0c14037c255ed026c8e20a4702b8e149f 100644 (file)
--- a/src/matcher.c
+++ b/src/matcher.c
@@ -834,10 +834,6 @@ gchar * matcherprop_to_string(MatcherProp * matcher)
        gchar * criteria_str;
        gchar * matchtype_str;
        int i;
-       gchar * p;
-       gint count;
-       gchar * expr_str;
-       gchar * out;
 
        criteria_str = NULL;
        for(i = 0 ; i < (int) (sizeof(matchparser_tab) / sizeof(MatchParser)) ;
@@ -1208,8 +1204,6 @@ void prefs_matcher_write_config(void)
 {
        gchar *rcpath;
        PrefFile *pfile;
-       GSList *cur;
-       ScoringProp * prop;
 
        debug_print("Writing matcher configuration...\n");
 

diff --git a/src/matcher_parser_lex.l b/src/matcher_parser_lex.l
index 7f4c8455bc31142e98b41156c6d688e3c1956282..8c33ee1b94af7df8c23e350b1a1df7ba3fe73bb8 100644 (file)
--- a/src/matcher_parser_lex.l
+++ b/src/matcher_parser_lex.l
@@ -1,7 +1,9 @@
 %{
+#include <string.h>
+#include <glib.h>
+
 #include "matcher_parser_lex.h"
 #include "matcher_parser_parse.h"
-#include <glib.h>
 
 #define MAX_STR_CONST 512
 

diff --git a/src/matcher_parser_parse.y b/src/matcher_parser_parse.y
index 79aff3d9e1e19107639eb7b15943ebe637bcc358..635aa8fe0a5532196a33333e49f4464d88425add 100644 (file)
--- a/src/matcher_parser_parse.y
+++ b/src/matcher_parser_parse.y
@@ -169,7 +169,7 @@ int matcher_parserwrap(void)
 
 %token <str> MATCHER_STRING
 %token <str> MATCHER_SECTION
-%token <value> MATCHER_INTEGER
+%token <str> MATCHER_INTEGER
 
 %%
 

diff --git a/src/mbox_folder.c b/src/mbox_folder.c
index 879ede799ce42a9d23e1bf90819cc2d915e779ff..7f786e28a9c5dd4ced1f05f6eb6dc9bfb794beab 100644 (file)
--- a/src/mbox_folder.c
+++ b/src/mbox_folder.c
@@ -92,7 +92,7 @@ static void mbox_folder_init(Folder *folder, const gchar *name, const gchar *pat
                                    = mbox_check_msgnum_validity;
 }
 
-static gchar * mbox_folder_create_parent(const gchar * path)
+static void mbox_folder_create_parent(const gchar * path)
 {
        if (!is_file_exist(path)) {
                gchar * new_path;
@@ -758,11 +758,6 @@ static void mbox_cache_init()
        mbox_cache_table = g_hash_table_new(g_str_hash, g_str_equal);
 }
 
-static void mbox_cache_done()
-{
-       g_hash_table_destroy(mbox_cache_table);
-}
-
 static void mbox_cache_free_mbox(mboxcache * cache)
 {
        g_hash_table_remove(mbox_cache_table, cache->filename);
@@ -907,16 +902,6 @@ static gint mbox_cache_get_count(gchar * filename)
        return cache->mf->count;
 }
 
-static gint mbox_cache_get_mtime(gchar * filename)
-{
-       mboxcache * cache;
-
-       cache = mbox_cache_get_mbox(filename);
-       if (cache == NULL)
-               return -1;
-       return cache->mtime;
-}
-
 static GList * mbox_cache_get_msg_list(gchar * filename)
 {
        mboxcache * cache;
@@ -982,8 +967,6 @@ static void mbox_cache_synchronize(gchar * filename, gboolean sync)
        }
 
        if (scan_new) {
-               GList * l;
-
                /*              
                if (strstr(filename, "trash") == 0)
                        printf("old_cache: %p %s\n", old_cache, filename);
@@ -1648,9 +1631,6 @@ gint mbox_copy_msg(Folder *folder, FolderItem *dest, MsgInfo *msginfo)
        Folder * src_folder;
        gchar * filename;
        gint num;
-       gchar * destdir;
-       gchar * mbox_path;
-       struct _message * msg;
        CopyFlagsInfo * flags_info;
 
        src_folder = msginfo->folder->folder;

diff --git a/src/mh.c b/src/mh.c
index 12bfe6820df0478144f28899f269163235508636..6187ca04bbb29d5dea57d68f84814a09675280bd 100644 (file)
--- a/src/mh.c
+++ b/src/mh.c
@@ -119,7 +119,7 @@ Folder *mh_folder_new(const gchar *name, const gchar *path)
        return folder;
 }
 
-void mh_folder_destroy(MHFolder *folder)
+void mh_folder_destroy(Folder *folder)
 {
        folder_local_folder_destroy(LOCAL_FOLDER(folder));
 }

diff --git a/src/mh.h b/src/mh.h
index 69e287041b36e54ffbb255ea5574b5ab612456bf..8f5cdb9f7ed74c78f4db0759d7775d39809bf46a 100644 (file)
--- a/src/mh.h
+++ b/src/mh.h
@@ -36,6 +36,6 @@ struct _MHFolder
 
 Folder *mh_folder_new          (const gchar    *name,
                                 const gchar    *path);
-void     mh_folder_destroy     (MHFolder       *folder);
+void     mh_folder_destroy     (Folder         *folder);
 
 #endif /* __MH_H__ */

diff --git a/src/news.h b/src/news.h
index 33652efa7400abb45536552e7d36bc98d92f1665..fec7348aa24cf963ac41372d6fcdebe4940015e5 100644 (file)
--- a/src/news.h
+++ b/src/news.h
@@ -80,6 +80,7 @@ void news_remove_group_list_cache     (Folder         *folder);
 gint news_post                         (Folder         *folder,
                                         const gchar    *file);
 
-gint news_cancel_article(Folder * folder, MsgInfo * msginfo);
+gint news_cancel_article               (Folder         *folder,
+                                        MsgInfo        *msginfo);
 
 #endif /* __NEWS_H__ */

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 9f81c77caa8ac3cfec87a23483fdb684c95baf0f..543ab362fc9d15986ae8e869887ae092b3e2abae 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -217,8 +217,6 @@ static void prefs_account_nntpauth_toggled(GtkToggleButton *button,
                                           gpointer user_data);
 static void prefs_account_mailcmd_toggled(GtkToggleButton *button,
                                          gpointer user_data);
-static void prefs_account_smtp_userid_cb(GtkEditable *editable,
-                                        gpointer smtp_passwd);
 
 static PrefParam param[] = {
        /* Basic */

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 37f7c203d3e5bd944d1c516af289fe9419e8d917..2d296dec45f636919f4f5227e9818063f5be680a 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -819,7 +819,6 @@ static void prefs_common_create             (void);
 static void prefs_receive_create       (void);
 static void prefs_send_create          (void);
 static void prefs_compose_create       (void);
-static void prefs_spelling_create      (void);
 static void prefs_quote_create         (void);
 static void prefs_display_create       (void);
 static void prefs_message_create       (void);

diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index a31b94fbe4ed0576c96c6590a18250b744ec9d51..0c93e94adc37b05839855cd92ac57e32ba0e9bee 100644 (file)
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -302,7 +302,6 @@ static void prefs_toolbar_save(void)
        gint row = 0;
        GtkCList *clist = GTK_CLIST(toolbar.clist_set);
        gchar *entry = NULL;
-       GSList *toolbar_list = NULL;
        
        toolbar_clear_list(toolbar.source);
 

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 1249528e601483563b7f85ee478df4c9f5f2aec6..fa871f4328a215bf68d4717453dfcc07b1626167 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -68,13 +68,6 @@ static void add_buffer(const gchar *s)
        bufsize += len;
 }
 
-static void flush_buffer(void)
-{
-       if (buffer != NULL)
-               *buffer = '\0';
-       bufsize = 0;
-}
-
 gchar *quote_fmt_get_buffer(void)
 {
        if (error != 0)
@@ -579,7 +572,7 @@ insert:
                        FILE *file;
                        char buffer[256];
                        
-                       if(file = fopen($3, "rb")) {
+                       if((file = fopen($3, "rb")) != NULL) {
                                while(fgets(buffer, sizeof(buffer), file)) {
                                        INSERT(buffer);
                                }
@@ -593,7 +586,7 @@ insert:
                        FILE *file;
                        char buffer[256];
 
-                       if(file = popen($3, "r")) {
+                       if((file = popen($3, "r")) != NULL) {
                                while(fgets(buffer, sizeof(buffer), file)) {
                                        INSERT(buffer);
                                }

diff --git a/src/send.c b/src/send.c
index 485fc2621326bd889f634360cbdebf0c4a7a6e8f..5a8de4bb0e018d4e6f7885223f09a3d940b42430 100644 (file)
--- a/src/send.c
+++ b/src/send.c
@@ -51,6 +51,7 @@
 #include "utils.h"
 #include "gtkutils.h"
 #include "statusbar.h"
+#include "inc.h"
 
 typedef struct _SendProgressDialog     SendProgressDialog;
 

diff --git a/src/stringtable.c b/src/stringtable.c
index 90159537b6dd358277d999e27b5cc3311d7b98b4..b584ff676c8250f34bd7c5f83e249c869a6c6664 100644 (file)
--- a/src/stringtable.c
+++ b/src/stringtable.c
@@ -49,15 +49,6 @@ static StringEntry *string_entry_new(const gchar *str)
        return entry;
 }
 
-static void string_entry_free(StringEntry *entry)
-{
-       g_return_if_fail(entry != NULL);
-       g_return_if_fail(entry->string);
-
-       g_free(entry->string);
-       g_free(entry);
-}
-
 StringTable *string_table_new(void)
 {
        StringTable *strtable;

diff --git a/src/summaryview.c b/src/summaryview.c
index 2f810f300094c1138d3441d12b475c653ad227c6..9d6967feab50661bc18638d01848f2b0d03efa1d 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -84,6 +84,7 @@
 #include "filtering.h"
 #include "string_match.h"
 #include "toolbar.h"
+#include "news.h"
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_UNREAD_WIDTH       13