From f8e5d2cfaad4374877f567cb96bb52469bd62763 Mon Sep 17 00:00:00 2001 From: Alfons Hoogervorst Date: Tue, 13 May 2003 11:54:19 +0000 Subject: [PATCH] * src/common/session.c remove debug traces * src/addrcache.[ch] * src/filtering.[ch] * src/folder.[c] * src/gtkaspell.[ch] * src/imap.[ch] * src/mbox_folder.[ch] * src/mh.[ch] * src/mimeview.h * src/msgcache.[ch] * src/news.[ch] * src/passphrase.[ch] * src/prefs_common.[ch] * src/prefs_gtk.[ch] * src/procmsg.c * src/scoring.[ch] be pedantic; (in prototypes () implies (int)) --- ChangeLog.claws | 22 ++++++++++++++++++++++ configure.ac | 2 +- src/addrcache.c | 2 +- src/addrcache.h | 2 +- src/common/session.c | 13 ------------- src/filtering.c | 2 +- src/filtering.h | 2 +- src/folder.c | 13 +++++++------ src/folder.h | 8 ++++---- src/gtkaspell.c | 4 ++-- src/gtkaspell.h | 6 +++--- src/imap.c | 2 +- src/imap.h | 2 +- src/mbox_folder.c | 2 +- src/mbox_folder.h | 2 +- src/mh.c | 2 +- src/mh.h | 2 +- src/mimeview.h | 2 +- src/msgcache.c | 2 +- src/msgcache.h | 2 +- src/news.c | 2 +- src/news.h | 2 +- src/passphrase.c | 2 +- src/passphrase.h | 2 +- src/prefs_common.c | 3 ++- src/prefs_common.h | 2 +- src/prefs_gtk.c | 2 +- src/prefs_gtk.h | 2 +- src/procmsg.c | 2 +- src/scoring.c | 2 +- src/scoring.h | 2 +- 31 files changed, 64 insertions(+), 53 deletions(-) diff --git a/ChangeLog.claws b/ChangeLog.claws index c2fe029f7..09ec36307 100644 --- a/ChangeLog.claws +++ b/ChangeLog.claws @@ -1,3 +1,25 @@ +2003-05-13 [alfons] 0.8.11claws151 + + * src/common/session.c + remove debug traces + + * src/addrcache.[ch] + * src/filtering.[ch] + * src/folder.[c] + * src/gtkaspell.[ch] + * src/imap.[ch] + * src/mbox_folder.[ch] + * src/mh.[ch] + * src/mimeview.h + * src/msgcache.[ch] + * src/news.[ch] + * src/passphrase.[ch] + * src/prefs_common.[ch] + * src/prefs_gtk.[ch] + * src/procmsg.c + * src/scoring.[ch] + be pedantic; (in prototypes () implies (int)) + 2003-05-13 [alfons] 0.8.11claws150 * src/prefs_toolbar.[ch] diff --git a/configure.ac b/configure.ac index 5a6b4ea96..d5bbda8dc 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=8 MICRO_VERSION=11 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=claws150 +EXTRA_VERSION=claws151 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION dnl set $target diff --git a/src/addrcache.c b/src/addrcache.c index df273c5db..97326e15d 100644 --- a/src/addrcache.c +++ b/src/addrcache.c @@ -50,7 +50,7 @@ static int addrcache_next_cache_id() { /* * Create new address cache. */ -AddressCache *addrcache_create() { +AddressCache *addrcache_create(void) { AddressCache *cache; gint t; diff --git a/src/addrcache.h b/src/addrcache.h index b7da1689f..41b287db1 100644 --- a/src/addrcache.h +++ b/src/addrcache.h @@ -49,7 +49,7 @@ struct _AddressCache { }; /* Function prototypes */ -AddressCache *addrcache_create(); +AddressCache *addrcache_create ( void ); ItemFolder *addrcache_get_root_folder ( AddressCache *cache ); GList *addrcache_get_list_folder ( AddressCache *cache ); GList *addrcache_get_list_person ( AddressCache *cache ); diff --git a/src/common/session.c b/src/common/session.c index 3716046fb..d4920f67a 100644 --- a/src/common/session.c +++ b/src/common/session.c @@ -209,13 +209,9 @@ void session_destroy(Session *session) debug_print("session: session_destroy()\n"); session_close(session); - g_print("$$$ session_destroy() session->destroy called\n"); session->destroy(session); - g_print("$$$ session_destroy() freeing session server\n"); g_free(session->server); - g_print("$$$ session_destroy() freeing session\n"); g_free(session); - g_print("$$$ session_destroy() done\n"); } void session_set_recv_message_notify(Session *session, @@ -276,21 +272,18 @@ static gint session_close(Session *session) session->read_tag = 0; } - g_print("$$$ %s: closing read channel\n", session->child_pid == 0 ? "child" : "parent"); if (session->read_ch) { g_io_channel_close(session->read_ch); g_io_channel_unref(session->read_ch); session->read_ch = NULL; } - g_print("$$$ %s: closing write channel\n", session->child_pid == 0 ? "child" : "parent"); if (session->write_ch) { g_io_channel_close(session->write_ch); g_io_channel_unref(session->write_ch); session->write_ch = NULL; } - g_print("$$$ %s: closing socket\n", session->child_pid == 0 ? "child" : "parent"); if (session->sock) { sock_close(session->sock); session->sock = NULL; @@ -298,14 +291,12 @@ static gint session_close(Session *session) } if (session->child_pid) { - g_print("$$$ %s: closing child\n", session->child_pid == 0 ? "child" : "parent"); if (session->state != SESSION_DISCONNECTED) kill(session->child_pid, SIGTERM); waitpid(session->child_pid, NULL, 0); session->child_pid = 0; } - g_print("$$$ %s: exiting session_close\n", session->child_pid == 0 ? "child" : "parent"); return 0; } @@ -731,12 +722,8 @@ gboolean session_parent_input_cb(GIOChannel *source, GIOCondition condition, case SESSION_MSG_NORMAL: msg_data = msg + strlen("MESSAGE "); ret = session->recv_msg(session, msg_data); - g_print("$$$ > session_parent_input_cb(data: %lx)\n", - session->recv_msg_notify_data); session->recv_msg_notify(session, msg_data, session->recv_msg_notify_data); - g_print("$$$ < session_parent_input_cb(data: %lx)\n", - session->recv_msg_notify_data); if (ret > 0) session_send_msg(session, SESSION_MSG_CONTROL, "CONTINUE"); diff --git a/src/filtering.c b/src/filtering.c index 019bfa39e..6b9b13991 100644 --- a/src/filtering.c +++ b/src/filtering.c @@ -438,7 +438,7 @@ static gboolean prefs_filtering_free_func(GNode *node, gpointer data) return FALSE; } -void prefs_filtering_clear() +void prefs_filtering_clear(void) { GList * cur; diff --git a/src/filtering.h b/src/filtering.h index 15f677f3d..255fa16c0 100644 --- a/src/filtering.h +++ b/src/filtering.h @@ -65,7 +65,7 @@ void prefs_filtering_write_config(void); void prefs_filtering_read_config(void); gchar * filteringprop_to_string(FilteringProp *prop); -void prefs_filtering_clear(); +void prefs_filtering_clear(void); void prefs_filtering_free(GSList *prefs_filtering); FilteringProp * filteringprop_copy(FilteringProp *src); diff --git a/src/folder.c b/src/folder.c index fcfeb2600..e7f93978c 100644 --- a/src/folder.c +++ b/src/folder.c @@ -76,7 +76,7 @@ void folder_item_free_cache (FolderItem *item); static GSList *classlist; -void folder_system_init() +void folder_system_init(void) { folder_register_class(mh_get_class()); folder_register_class(imap_get_class()); @@ -84,7 +84,7 @@ void folder_system_init() folder_register_class(mbox_get_class()); } -GSList *folder_get_class_list() +GSList *folder_get_class_list(void) { return classlist; } @@ -1329,7 +1329,7 @@ void folder_item_free_cache(FolderItem *item) item->cache = NULL; } -void folder_clean_cache_memory() +void folder_clean_cache_memory(void) { gint memusage = 0; @@ -2550,7 +2550,8 @@ static void folder_update_op_count_rec(GNode *node) } } -void folder_update_op_count() { +void folder_update_op_count(void) +{ GList *cur; Folder *folder; @@ -2813,7 +2814,7 @@ void folder_item_update_recursive(FolderItem *item, FolderItemUpdateFlags update } } -void folder_item_update_freeze() +void folder_item_update_freeze(void) { folder_item_update_freeze_cnt++; } @@ -2830,7 +2831,7 @@ static void folder_item_update_func(FolderItem *item, gpointer data) } } -void folder_item_update_thaw() +void folder_item_update_thaw(void) { if (folder_item_update_freeze_cnt > 0) folder_item_update_freeze_cnt--; diff --git a/src/folder.h b/src/folder.h index b426051f4..a8d4d9c0c 100644 --- a/src/folder.h +++ b/src/folder.h @@ -306,7 +306,7 @@ struct _FolderItemUpdateData FolderItemUpdateFlags update_flags; }; -void folder_system_init (); +void folder_system_init (void); void folder_register_class (FolderClass *klass); Folder *folder_new (FolderClass *type, const gchar *name, @@ -420,7 +420,7 @@ const PersistPrefs *folder_get_persist_prefs (GHashTable *pptable, const char *name); void folder_item_restore_persist_prefs (FolderItem *item, GHashTable *pptable); -void folder_clean_cache_memory (); +void folder_clean_cache_memory (void); void folder_item_write_cache (FolderItem *item); void folder_item_set_default_flags (FolderItem *dest, MsgFlags *flags); @@ -430,7 +430,7 @@ void folder_item_update (FolderItem *item, FolderItemUpdateFlags update_flags); void folder_item_update_recursive (FolderItem *item, FolderItemUpdateFlags update_flags); -void folder_item_update_freeze (); -void folder_item_update_thaw (); +void folder_item_update_freeze (void); +void folder_item_update_thaw (void); #endif /* __FOLDER_H__ */ diff --git a/src/gtkaspell.c b/src/gtkaspell.c index 048251a3c..9d1364660 100644 --- a/src/gtkaspell.c +++ b/src/gtkaspell.c @@ -192,7 +192,7 @@ GtkAspellConfig * gtkaspellconfig; /******************************************************************************/ -GtkAspellCheckers *gtkaspell_checkers_new() +GtkAspellCheckers *gtkaspell_checkers_new(void) { GtkAspellCheckers *gtkaspellcheckers; @@ -204,7 +204,7 @@ GtkAspellCheckers *gtkaspell_checkers_new() return gtkaspellcheckers; } -GtkAspellCheckers *gtkaspell_checkers_delete() +GtkAspellCheckers *gtkaspell_checkers_delete(void) { GSList *checkers; GSList *dict_list; diff --git a/src/gtkaspell.h b/src/gtkaspell.h index 6a0203aae..8405aa4c9 100644 --- a/src/gtkaspell.h +++ b/src/gtkaspell.h @@ -97,11 +97,11 @@ typedef AspellConfig GtkAspellConfig; extern GtkAspellCheckers *gtkaspellcheckers; -GtkAspellCheckers* gtkaspell_checkers_new (); +GtkAspellCheckers* gtkaspell_checkers_new (void); -GtkAspellCheckers* gtkaspell_checkers_delete (); +GtkAspellCheckers* gtkaspell_checkers_delete (void); -void gtkaspell_checkers_reset_error (); +void gtkaspell_checkers_reset_error (void); GtkAspell* gtkaspell_new (const gchar *dictionary, const gchar *encoding, diff --git a/src/imap.c b/src/imap.c index e1d51906e..c79f52dad 100644 --- a/src/imap.c +++ b/src/imap.c @@ -419,7 +419,7 @@ FolderClass imap_class = imap_change_flags, }; -FolderClass *imap_get_class() +FolderClass *imap_get_class(void) { return &imap_class; } diff --git a/src/imap.h b/src/imap.h index 768b4d515..6f6c29ee8 100644 --- a/src/imap.h +++ b/src/imap.h @@ -22,6 +22,6 @@ #include "folder.h" -FolderClass *imap_get_class (); +FolderClass *imap_get_class (void); #endif /* __IMAP_H__ */ diff --git a/src/mbox_folder.c b/src/mbox_folder.c index ca5a6bb1c..d923e1ebb 100644 --- a/src/mbox_folder.c +++ b/src/mbox_folder.c @@ -107,7 +107,7 @@ FolderClass mbox_class = mbox_change_flags, }; -FolderClass *mbox_get_class() +FolderClass *mbox_get_class(void) { return &mbox_class; } diff --git a/src/mbox_folder.h b/src/mbox_folder.h index dcea18665..71fb1cd96 100644 --- a/src/mbox_folder.h +++ b/src/mbox_folder.h @@ -40,7 +40,7 @@ struct _MBOXFolder LocalFolder lfolder; }; -FolderClass *mbox_get_class (); +FolderClass *mbox_get_class (void); gchar * mbox_get_virtual_path(FolderItem * item); #endif diff --git a/src/mh.c b/src/mh.c index 9b3149fa7..b4b8a0372 100644 --- a/src/mh.c +++ b/src/mh.c @@ -117,7 +117,7 @@ FolderClass mh_class = NULL, }; -FolderClass *mh_get_class() +FolderClass *mh_get_class(void) { return &mh_class; } diff --git a/src/mh.h b/src/mh.h index 105383775..fd5ecfd13 100644 --- a/src/mh.h +++ b/src/mh.h @@ -34,6 +34,6 @@ struct _MHFolder LocalFolder lfolder; }; -FolderClass *mh_get_class (); +FolderClass *mh_get_class (void); #endif /* __MH_H__ */ diff --git a/src/mimeview.h b/src/mimeview.h index 3d030c63e..4d53a1b2c 100644 --- a/src/mimeview.h +++ b/src/mimeview.h @@ -77,7 +77,7 @@ struct _MimeViewerFactory gchar *content_type; gint priority; - MimeViewer *(*create_viewer) (); + MimeViewer *(*create_viewer) (void); }; struct _MimeViewer diff --git a/src/msgcache.c b/src/msgcache.c index 961b0df2b..3fd6bc33d 100644 --- a/src/msgcache.c +++ b/src/msgcache.c @@ -35,7 +35,7 @@ struct _MsgCache { time_t last_access; }; -MsgCache *msgcache_new() +MsgCache *msgcache_new(void) { MsgCache *cache; diff --git a/src/msgcache.h b/src/msgcache.h index b5a37f9e3..2e324c51d 100644 --- a/src/msgcache.h +++ b/src/msgcache.h @@ -31,7 +31,7 @@ typedef struct _MsgCache MsgCache; #include "procmsg.h" #include "folder.h" -MsgCache *msgcache_new (); +MsgCache *msgcache_new (void); void msgcache_destroy (MsgCache *cache); MsgCache *msgcache_read_cache (FolderItem *item, const gchar *cache_file); diff --git a/src/news.c b/src/news.c index af61bf86e..28d040e30 100644 --- a/src/news.c +++ b/src/news.c @@ -149,7 +149,7 @@ FolderClass news_class = NULL, }; -FolderClass *news_get_class() +FolderClass *news_get_class(void) { return &news_class; } diff --git a/src/news.h b/src/news.h index 9b31be68e..302dedf2b 100644 --- a/src/news.h +++ b/src/news.h @@ -45,7 +45,7 @@ struct _NewsGroupInfo gchar type; }; -FolderClass *news_get_class (); +FolderClass *news_get_class (void); gint news_post (Folder * folder, const gchar * file); diff --git a/src/passphrase.c b/src/passphrase.c index 3bdae4e04..8e44f9ec3 100644 --- a/src/passphrase.c +++ b/src/passphrase.c @@ -319,7 +319,7 @@ gpgmegtk_passphrase_cb (void *opaque, const char *desc, void **r_hd) return pass; } -void gpgmegtk_free_passphrase() +void gpgmegtk_free_passphrase(void) { (void)free_passphrase(NULL); /* could be inline */ } diff --git a/src/passphrase.h b/src/passphrase.h index e33301d93..5556a50c1 100644 --- a/src/passphrase.h +++ b/src/passphrase.h @@ -29,6 +29,6 @@ struct passphrase_cb_info_s { void gpgmegtk_set_passphrase_grab (gint yesno); const char* gpgmegtk_passphrase_cb(void *opaque, const char *desc, void **r_hd); -void gpgmegtk_free_passphrase(); +void gpgmegtk_free_passphrase (void); #endif /* GPGMEGTK_PASSPHRASE_H */ diff --git a/src/prefs_common.c b/src/prefs_common.c index b31199ed2..1b9523c84 100644 --- a/src/prefs_common.c +++ b/src/prefs_common.c @@ -914,7 +914,8 @@ static void prefs_common_ok (void); static void prefs_common_apply (void); static void prefs_common_cancel (void); -void prefs_common_init() { +void prefs_common_init(void) +{ prefs_common.disphdr_list = NULL; } diff --git a/src/prefs_common.h b/src/prefs_common.h index 212a0b652..b84f485fe 100644 --- a/src/prefs_common.h +++ b/src/prefs_common.h @@ -283,7 +283,7 @@ struct _PrefsCommon extern PrefsCommon prefs_common; -void prefs_common_init (); +void prefs_common_init (void); void prefs_common_read_config (void); void prefs_common_save_config (void); void prefs_common_open (void); diff --git a/src/prefs_gtk.c b/src/prefs_gtk.c index 6047f09c5..b9b78c258 100644 --- a/src/prefs_gtk.c +++ b/src/prefs_gtk.c @@ -769,7 +769,7 @@ void prefs_set_spinbtn(PrefParam *pparam) static GSList *prefs_pages = NULL; -void prefs_gtk_open() +void prefs_gtk_open(void) { prefswindow_open(prefs_pages, NULL); } diff --git a/src/prefs_gtk.h b/src/prefs_gtk.h index c64f5feb8..ca0f0f583 100644 --- a/src/prefs_gtk.h +++ b/src/prefs_gtk.h @@ -170,7 +170,7 @@ void prefs_set_toggle (PrefParam *pparam); void prefs_set_data_from_spinbtn(PrefParam *pparam); void prefs_set_spinbtn (PrefParam *pparam); -void prefs_gtk_open (); +void prefs_gtk_open (void); void prefs_gtk_register_page (PrefsPage *page); void prefs_gtk_unregister_page (PrefsPage *page); diff --git a/src/procmsg.c b/src/procmsg.c index 0f18169d4..4515dfa68 100644 --- a/src/procmsg.c +++ b/src/procmsg.c @@ -772,7 +772,7 @@ MsgInfo *procmsg_msginfo_new_ref(MsgInfo *msginfo) return msginfo; } -MsgInfo *procmsg_msginfo_new() +MsgInfo *procmsg_msginfo_new(void) { MsgInfo *newmsginfo; diff --git a/src/scoring.c b/src/scoring.c index 3218a3048..9bb603466 100644 --- a/src/scoring.c +++ b/src/scoring.c @@ -131,7 +131,7 @@ static gboolean prefs_scoring_free_func(GNode *node, gpointer data) return FALSE; } -void prefs_scoring_clear() +void prefs_scoring_clear(void) { GList * cur; diff --git a/src/scoring.h b/src/scoring.h index 080b2c13d..86b0fbcbd 100644 --- a/src/scoring.h +++ b/src/scoring.h @@ -33,7 +33,7 @@ void prefs_scoring_write_config(void); void prefs_scoring_read_config(void); gchar * scoringprop_to_string(ScoringProp * prop); -void prefs_scoring_clear(); +void prefs_scoring_clear(void); void prefs_scoring_free(GSList * prefs_scoring); #endif -- 2.25.1