From fe97fa2fbb1628f20ae975fcf549f551ee893228 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 18 Apr 2000 19:05:15 +0000 Subject: kill camel-log svn path=/trunk/; revision=2487 --- camel/providers/mbox/camel-mbox-folder.c | 61 ------------------------------ camel/providers/mbox/camel-mbox-parser.c | 44 --------------------- camel/providers/mbox/camel-mbox-parser.h | 1 - camel/providers/mbox/camel-mbox-provider.c | 1 - camel/providers/mbox/camel-mbox-search.c | 1 - camel/providers/mbox/camel-mbox-store.c | 4 -- camel/providers/mbox/camel-mbox-summary.c | 7 ---- 7 files changed, 119 deletions(-) (limited to 'camel/providers/mbox') diff --git a/camel/providers/mbox/camel-mbox-folder.c b/camel/providers/mbox/camel-mbox-folder.c index 3b48895dbf..9cd055a658 100644 --- a/camel/providers/mbox/camel-mbox-folder.c +++ b/camel/providers/mbox/camel-mbox-folder.c @@ -37,7 +37,6 @@ #include "camel-mbox-folder.h" #include "camel-mbox-store.h" #include "string-utils.h" -#include "camel-log.h" #include "camel-stream-fs.h" #include "camel-mbox-summary.h" #include "camel-mbox-parser.h" @@ -129,14 +128,10 @@ _finalize (GtkObject *object) { CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (object); - CAMEL_LOG_FULL_DEBUG ("Entering CamelFolder::finalize\n"); - - g_free (mbox_folder->folder_file_path); g_free (mbox_folder->folder_dir_path); GTK_OBJECT_CLASS (parent_class)->finalize (object); - CAMEL_LOG_FULL_DEBUG ("Leaving CamelFolder::finalize\n"); } @@ -177,10 +172,6 @@ _init (CamelFolder *folder, CamelStore *parent_store, CamelFolder *parent_folder, const gchar *name, gchar separator, CamelException *ex) { - - - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxFolder::init_with_store\n"); - /* call parent method */ parent_class->init (folder, parent_store, parent_folder, name, separator, ex); @@ -195,8 +186,6 @@ _init (CamelFolder *folder, CamelStore *parent_store, folder->has_uid_capability = TRUE; folder->has_search_capability = TRUE; folder->summary = NULL; - - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxFolder::init_with_store\n"); } @@ -348,8 +337,6 @@ _set_name (CamelFolder *folder, const gchar *name, CamelException *ex) CamelMboxFolder *mbox_folder = CAMEL_MBOX_FOLDER (folder); const gchar *root_dir_path; - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxFolder::set_name\n"); - /* call default implementation */ parent_class->set_name (folder, name, ex); if (camel_exception_get_id (ex)) return; @@ -360,19 +347,10 @@ _set_name (CamelFolder *folder, const gchar *name, CamelException *ex) root_dir_path = camel_mbox_store_get_toplevel_dir (CAMEL_MBOX_STORE(folder->parent_store)); - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::set_name full_name is %s\n", folder->full_name); - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::set_name root_dir_path is %s\n", root_dir_path); - mbox_folder->folder_file_path = g_strdup_printf ("%s/%s", root_dir_path, folder->full_name); mbox_folder->summary_file_path = g_strdup_printf ("%s/%s-ev-summary", root_dir_path, folder->full_name); mbox_folder->folder_dir_path = g_strdup_printf ("%s/%s.sdb", root_dir_path, folder->full_name); mbox_folder->index_file_path = g_strdup_printf ("%s/%s.ibex", root_dir_path, folder->full_name); - - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::set_name mbox_folder->folder_file_path is %s\n", - mbox_folder->folder_file_path); - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::set_name mbox_folder->folder_dir_path is %s\n", - mbox_folder->folder_dir_path); - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxFolder::set_name\n"); } @@ -390,8 +368,6 @@ _exists (CamelFolder *folder, CamelException *ex) g_assert(folder != NULL); - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxFolder::exists\n"); - mbox_folder = CAMEL_MBOX_FOLDER (folder); /* check if the mbox file path is determined */ @@ -416,9 +392,6 @@ _exists (CamelFolder *folder, CamelException *ex) /* check if the mbox directory exists */ access_result = access (mbox_folder->folder_dir_path, F_OK); if (access_result < 0) { - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::exists errot when executing access on %s\n", - mbox_folder->folder_dir_path); - CAMEL_LOG_FULL_DEBUG (" Full error text is : %s\n", strerror(errno)); camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, strerror(errno)); @@ -426,9 +399,6 @@ _exists (CamelFolder *folder, CamelException *ex) } stat_error = stat (mbox_folder->folder_dir_path, &stat_buf); if (stat_error == -1) { - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::exists when executing stat on %s, stat_error = %d\n", - mbox_folder->folder_dir_path, stat_error); - CAMEL_LOG_FULL_DEBUG (" Full error text is : %s\n", strerror(errno)); camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, strerror(errno)); @@ -447,7 +417,6 @@ _exists (CamelFolder *folder, CamelException *ex) exists = S_ISREG (stat_buf.st_mode); /* we should check the rights here */ - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxFolder::exists\n"); return exists; } @@ -522,11 +491,6 @@ _create (CamelFolder *folder, CamelException *ex) /* exception handling for io errors */ io_error : - - CAMEL_LOG_WARNING ("CamelMboxFolder::create, error when creating %s and %s\n", - folder_dir_path, folder_file_path); - CAMEL_LOG_FULL_DEBUG ( " Full error text is : %s\n", strerror(errno)); - if (errno == EACCES) { camel_exception_set (ex, CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION, @@ -584,7 +548,6 @@ _delete (CamelFolder *folder, gboolean recurse, CamelException *ex) /* physically delete the directory */ - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::delete removing directory %s\n", folder_dir_path); rmdir_error = rmdir (folder_dir_path); if (rmdir_error == -1) switch (errno) { @@ -689,11 +652,6 @@ _delete_messages (CamelFolder *folder, CamelException *ex) /* exception handling for io errors */ io_error : - - CAMEL_LOG_WARNING ("CamelMboxFolder::create, error when deleting files %s\n", - folder_file_path); - CAMEL_LOG_FULL_DEBUG ( " Full error text is : %s\n", strerror(errno)); - if (errno == EACCES) { camel_exception_set (ex, CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION, @@ -777,9 +735,6 @@ _list_subfolders (CamelFolder *folder, CamelException *ex) if ((stat_error != -1) && S_ISDIR (stat_buf.st_mode)) { /* yes, add it to the list */ if (entry_name[0] != '.') { - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::list_subfolders adding " - "%s\n", entry_name); - /* if the folder is a netscape folder, remove the ".sdb" from the name */ real_folder_name = string_prefix (entry_name, ".sdb", &folder_suffix_found); @@ -844,7 +799,6 @@ _get_message_count (CamelFolder *folder, CamelException *ex) message_count = CAMEL_MBOX_SUMMARY (folder->summary)->nb_message; - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::get_message_count found %d messages\n", message_count); return message_count; } @@ -864,8 +818,6 @@ _append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException gint fd1, fd2; int i; - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxFolder::append_message\n"); - tmp_message_filename = g_strdup_printf ("%s.tmp", mbox_folder->folder_file_path); @@ -966,7 +918,6 @@ _append_message (CamelFolder *folder, CamelMimeMessage *message, CamelException unlink (tmp_message_filename); g_free (tmp_message_filename); - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxFolder::append_message\n"); } @@ -980,8 +931,6 @@ _get_uid_list (CamelFolder *folder, CamelException *ex) GList *uid_list = NULL; int i; - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxFolder::get_uid_list\n"); - message_info_array = CAMEL_MBOX_SUMMARY (folder->summary)->message_info; @@ -990,8 +939,6 @@ _get_uid_list (CamelFolder *folder, CamelException *ex) uid_list = g_list_prepend (uid_list, g_strdup_printf ("%u", message_info->uid)); } - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxFolder::get_uid_list\n"); - return uid_list; } @@ -1038,8 +985,6 @@ _get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex) CamelMimeMessage *message = NULL; CamelStore *parent_store; - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxFolder::get_message_by_uid\n"); - searched_uid = strtoul (uid, NULL, 10); message_info_array = @@ -1060,7 +1005,6 @@ _get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex) CAMEL_EXCEPTION_FOLDER_INVALID_UID, "uid %s not found in the folder", uid); - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxFolder::get_uid_list\n"); return NULL; } @@ -1086,10 +1030,5 @@ _get_message_by_uid (CamelFolder *folder, const gchar *uid, CamelException *ex) message = camel_mime_message_new (); camel_data_wrapper_set_input_stream (CAMEL_DATA_WRAPPER (message), message_stream); - - - - - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxFolder::get_uid_list\n"); return message; } diff --git a/camel/providers/mbox/camel-mbox-parser.c b/camel/providers/mbox/camel-mbox-parser.c index c03639133f..b9091278fb 100644 --- a/camel/providers/mbox/camel-mbox-parser.c +++ b/camel/providers/mbox/camel-mbox-parser.c @@ -27,7 +27,6 @@ #include #include "camel-mbox-parser.h" #include "camel-mbox-utils.h" -#include "camel-log.h" #include "camel-exception.h" #include #include @@ -101,8 +100,6 @@ static void clear_message_info (CamelMboxParserMessageInfo *preparsing_info) { - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::clear_message_info\n"); - preparsing_info->message_position = 0; preparsing_info->size = 0; preparsing_info->from = NULL; @@ -116,8 +113,6 @@ clear_message_info (CamelMboxParserMessageInfo *preparsing_info) preparsing_info->x_evolution_offset = 0; preparsing_info->status = 0; preparsing_info->uid = 0; - - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::clear_message_info\n"); } @@ -138,8 +133,6 @@ new_parser (int fd, { CamelMboxPreParser *parser; - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::ew_parser\n"); - parser = g_new0 (CamelMboxPreParser, 1); parser->fd = fd; @@ -155,8 +148,6 @@ new_parser (int fd, parser->tmp_string = g_string_sized_new (1000); - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::ew_parser\n"); - return parser; } @@ -174,14 +165,10 @@ new_parser (int fd, static void parser_free (CamelMboxPreParser *parser) { - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::parser_free\n"); - g_free (parser->buffer); g_free (parser->message_delimiter); g_string_free (parser->tmp_string, TRUE); g_free (parser); - - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::parser_free\n"); } @@ -203,8 +190,6 @@ initialize_buffer (CamelMboxPreParser *parser, gint seek_res; gint buf_nb_read; - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::intialize_buffer\n"); - g_assert (parser); /* set the search start position */ @@ -233,9 +218,6 @@ initialize_buffer (CamelMboxPreParser *parser, parser->last_position = MIN (buf_nb_read + parser->left_chunk_size + 1, MBOX_PARSER_BUF_SIZE - parser->left_chunk_size); parser->current_position = parser->left_chunk_size; - - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::intialize_buffer\n"); - } @@ -261,8 +243,6 @@ read_next_buffer_chunk (CamelMboxPreParser *parser) g_assert (parser); - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::intialize_buffer\n"); - /* read the next chunk of data in the folder file : */ /* - first, copy the last bytes from the previous chunk at the begining of the new one. */ @@ -288,8 +268,6 @@ read_next_buffer_chunk (CamelMboxPreParser *parser) MBOX_PARSER_BUF_SIZE - parser->left_chunk_size); parser->current_position = 0; - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::intialize_buffer\n"); - } @@ -333,8 +311,6 @@ advance_n_chars (CamelMboxPreParser *parser, guint n) gint position_to_the_end; - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::advnce_n_chars\n"); - position_to_the_end = parser->last_position - parser->current_position; if (n < position_to_the_end) @@ -345,8 +321,6 @@ advance_n_chars (CamelMboxPreParser *parser, guint n) } parser->real_position += n; - - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::advance_n_chars\n"); } @@ -376,11 +350,8 @@ new_message_detected (CamelMboxPreParser *parser) gchar c; - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::new_message_detected\n"); - /* if we were filling a message information save it in the message information array */ - CAMEL_LOG_FULL_DEBUG (" Message position : %d\n", parser->real_position); if (parser->is_pending_message) { parser->current_message_info.size = parser->real_position - parser->current_message_info.message_position; @@ -402,8 +373,6 @@ new_message_detected (CamelMboxPreParser *parser) (parser->current_message_info).message_position = parser->real_position; parser->is_pending_message = TRUE; - - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::new_message_detected\n"); } @@ -439,9 +408,6 @@ read_header (CamelMboxPreParser *parser, gchar **header_content) gchar *buffer; gchar c; - - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::read_header\n"); - g_assert (parser); /* reset the header buffer string */ @@ -493,8 +459,6 @@ read_header (CamelMboxPreParser *parser, gchar **header_content) /* copy the buffer in the preparsing information structure */ *header_content = g_strndup (parser->tmp_string->str, parser->tmp_string->len); - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::read_header\n"); - } @@ -522,8 +486,6 @@ read_message_begining (CamelMboxPreParser *parser, gchar **message_summary) guint nb_line = 0; g_assert (parser); - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::read_message_begining\n"); - /* reset the header buffer string */ parser->tmp_string = g_string_truncate (parser->tmp_string, 0); @@ -567,8 +529,6 @@ read_message_begining (CamelMboxPreParser *parser, gchar **message_summary) *message_summary = g_strndup (parser->tmp_string->str, parser->tmp_string->len); - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxParser::read_message_begining\n"); - return new_message; } @@ -635,8 +595,6 @@ camel_mbox_parse_file (int fd, g_assert (next_uid); - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::parse_file\n"); - /* get file size */ fstat_result = fstat (fd, &stat_buf); if (fstat_result == -1) { @@ -819,8 +777,6 @@ camel_mbox_parse_file (int fd, /* free the parser */ parser_free (parser); - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxParser::parse_file\n"); - return return_value; } diff --git a/camel/providers/mbox/camel-mbox-parser.h b/camel/providers/mbox/camel-mbox-parser.h index 1c49ea55c6..9a566bf5af 100644 --- a/camel/providers/mbox/camel-mbox-parser.h +++ b/camel/providers/mbox/camel-mbox-parser.h @@ -24,7 +24,6 @@ */ #include -#include "camel-log.h" #include "camel-exception.h" diff --git a/camel/providers/mbox/camel-mbox-provider.c b/camel/providers/mbox/camel-mbox-provider.c index 7fb57c3d1c..74c4345306 100644 --- a/camel/providers/mbox/camel-mbox-provider.c +++ b/camel/providers/mbox/camel-mbox-provider.c @@ -26,7 +26,6 @@ #include "config.h" #include "camel-mbox-store.h" #include "camel-provider.h" -#include "camel-log.h" static CamelProvider _mbox_provider = { diff --git a/camel/providers/mbox/camel-mbox-search.c b/camel/providers/mbox/camel-mbox-search.c index 0b1b9c3206..1a584b8db6 100644 --- a/camel/providers/mbox/camel-mbox-search.c +++ b/camel/providers/mbox/camel-mbox-search.c @@ -27,7 +27,6 @@ #include -#include #include "camel/camel-mime-message.h" #include "camel/camel-mime-part.h" #include "camel/camel-stream.h" diff --git a/camel/providers/mbox/camel-mbox-store.c b/camel/providers/mbox/camel-mbox-store.c index 0081aedb0e..8db2f9338e 100644 --- a/camel/providers/mbox/camel-mbox-store.c +++ b/camel/providers/mbox/camel-mbox-store.c @@ -23,7 +23,6 @@ #include -#include "camel-log.h" #include "camel-mbox-store.h" #include "camel-mbox-folder.h" @@ -109,7 +108,6 @@ get_folder (CamelStore *store, const char *folder_name, CamelException *ex) CamelMboxFolder *new_mbox_folder; CamelFolder *new_folder; - CAMEL_LOG_FULL_DEBUG ("Entering CamelMboxStore::get_folder\n"); new_mbox_folder = gtk_type_new (CAMEL_MBOX_FOLDER_TYPE); new_folder = CAMEL_FOLDER (new_mbox_folder); @@ -120,8 +118,6 @@ get_folder (CamelStore *store, const char *folder_name, CamelException *ex) CF_CLASS (new_folder)->init (new_folder, store, NULL, folder_name, '/', ex); - CAMEL_LOG_FULL_DEBUG ("Leaving CamelMboxStore::get_folder\n"); - return new_folder; } diff --git a/camel/providers/mbox/camel-mbox-summary.c b/camel/providers/mbox/camel-mbox-summary.c index e394637128..e15bb13b03 100644 --- a/camel/providers/mbox/camel-mbox-summary.c +++ b/camel/providers/mbox/camel-mbox-summary.c @@ -24,7 +24,6 @@ #include -#include "camel-log.h" #include "camel-exception.h" #include "camel-mbox-folder.h" #include "camel-mbox-summary.h" @@ -175,8 +174,6 @@ camel_mbox_summary_save (CamelMboxSummary *summary, const gchar *filename, gint write_result; /* XXX use this */ guint32 data; - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::save_summary entering \n"); - fd = open (filename, O_WRONLY | O_CREAT | O_TRUNC, S_IRUSR | S_IWUSR); if (fd == -1) { @@ -271,8 +268,6 @@ camel_mbox_summary_save (CamelMboxSummary *summary, const gchar *filename, } close (fd); - - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::save_summary leaving \n"); } @@ -297,8 +292,6 @@ camel_mbox_summary_load (const gchar *filename, CamelException *ex) gint read_result; guint32 data; - CAMEL_LOG_FULL_DEBUG ("CamelMboxFolder::save_summary entering \n"); - fd = open (filename, O_RDONLY); if (fd == -1) { camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION, -- cgit v1.2.3