From 928b6b596e7b5929f1b0c1d065827e73c557ed95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Garc=C3=ADa=20S=C3=A1ez?= Date: Tue, 14 Jul 2015 13:09:09 +0200 Subject: [PATCH] oc: OC_DEBUG inside macros These macros are used before and after every performed operation --- OpenChange/MAPIStoreSOGo.m | 105 +++---------------------------------- 1 file changed, 6 insertions(+), 99 deletions(-) diff --git a/OpenChange/MAPIStoreSOGo.m b/OpenChange/MAPIStoreSOGo.m index 4ec0ba53a..a41dd5a28 100644 --- a/OpenChange/MAPIStoreSOGo.m +++ b/OpenChange/MAPIStoreSOGo.m @@ -61,11 +61,14 @@ static BOOL initialization_done = NO; if (!initialization_done) { \ OC_DEBUG(5, "[SOGo] You should call sogo_backend_init() first. Current thread: %p, pid: %d\n", \ GSCurrentThread(), getpid()); \ - } + } \ + OC_DEBUG(5, "[SOGo] --->"); + #define NS_CURRENT_THREAD_TRY_UNREGISTER() \ if (__nsrct_thread_registered) { \ GSUnregisterCurrentThread(); \ - } + } \ + OC_DEBUG(6, "[SOGo] <---"); #define TRYCATCH_START @try { #define TRYCATCH_END(pool) \ @@ -214,8 +217,6 @@ sogo_backend_create_context(TALLOC_CTX *mem_ctx, MAPIStoreContext *context; int rc; - OC_DEBUG(5, "[SOGo]"); - NS_CURRENT_THREAD_REGISTER(); pool = [NSAutoreleasePool new]; @@ -251,8 +252,6 @@ sogo_backend_create_root_folder (const char *username, NSString *mapistoreUri; int rc; - OC_DEBUG(5, "[SOGo]"); - NS_CURRENT_THREAD_REGISTER(); pool = [NSAutoreleasePool new]; @@ -288,8 +287,6 @@ sogo_backend_list_contexts(const char *username, struct indexing_context *indexi NSString *userName; int rc; - OC_DEBUG(5, "[SOGo]"); - NS_CURRENT_THREAD_REGISTER(); pool = [NSAutoreleasePool new]; @@ -336,8 +333,6 @@ sogo_context_get_path(void *backend_object, TALLOC_CTX *mem_ctx, MAPIStoreContext *context; int rc; - OC_DEBUG(5, "[SOGo]"); - if (backend_object) { wrapper = backend_object; @@ -370,8 +365,6 @@ sogo_context_get_root_folder(void *backend_object, TALLOC_CTX *mem_ctx, MAPIStoreFolder *folder; int rc; - OC_DEBUG(5, "[SOGo]"); - if (backend_object) { wrapper = backend_object; @@ -413,8 +406,6 @@ sogo_folder_open_folder(void *folder_object, TALLOC_CTX *mem_ctx, uint64_t fid, MAPIStoreFolder *folder, *childFolder; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -442,7 +433,7 @@ sogo_folder_open_folder(void *folder_object, TALLOC_CTX *mem_ctx, uint64_t fid, /** \details Create a folder in the sogo backend - + \param private_data pointer to the current sogo context \return MAPISTORE_SUCCESS on success, otherwise MAPISTORE_ERROR @@ -457,8 +448,6 @@ sogo_folder_create_folder(void *folder_object, TALLOC_CTX *mem_ctx, MAPIStoreFolder *folder, *childFolder; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -500,8 +489,6 @@ sogo_folder_delete(void *folder_object) MAPIStoreFolder *folder; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -532,8 +519,6 @@ sogo_folder_get_child_count(void *folder_object, enum mapistore_table_type table MAPIStoreFolder *folder; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -568,8 +553,6 @@ sogo_folder_open_message(void *folder_object, MAPIStoreMessage *message; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -610,8 +593,6 @@ sogo_folder_create_message(void *folder_object, MAPIStoreMessage *message; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -646,8 +627,6 @@ sogo_folder_delete_message(void *folder_object, uint64_t mid, uint8_t flags) MAPIStoreFolder *folder; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -684,8 +663,6 @@ sogo_folder_move_copy_messages(void *folder_object, struct MAPIStoreTallocWrapper *wrapper; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -728,8 +705,6 @@ sogo_folder_move_folder(void *folder_object, void *target_folder_object, struct MAPIStoreTallocWrapper *wrapper; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -778,8 +753,6 @@ sogo_folder_copy_folder(void *folder_object, void *target_folder_object, TALLOC_ struct MAPIStoreTallocWrapper *wrapper; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -822,8 +795,6 @@ sogo_folder_get_deleted_fmids(void *folder_object, TALLOC_CTX *mem_ctx, MAPIStoreFolder *folder; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -861,8 +832,6 @@ sogo_folder_open_table(void *folder_object, TALLOC_CTX *mem_ctx, MAPIStoreTable *table; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -900,8 +869,6 @@ sogo_folder_modify_permissions(void *folder_object, uint8_t flags, MAPIStoreFolder *folder; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -934,8 +901,6 @@ sogo_folder_preload_message_bodies(void *folder_object, enum mapistore_table_typ MAPIStoreFolder *folder; int rc; - OC_DEBUG(5, "[SOGo]"); - if (folder_object) { wrapper = folder_object; @@ -969,8 +934,6 @@ sogo_message_get_message_data(void *message_object, MAPIStoreMessage *message; int rc; - OC_DEBUG(5, "[SOGo]"); - if (message_object) { wrapper = message_object; @@ -1004,8 +967,6 @@ sogo_message_create_attachment (void *message_object, TALLOC_CTX *mem_ctx, void MAPIStoreAttachment *attachment; int rc; - OC_DEBUG(5, "[SOGo]"); - if (message_object) { wrapper = message_object; @@ -1041,8 +1002,6 @@ sogo_message_open_attachment (void *message_object, TALLOC_CTX *mem_ctx, MAPIStoreAttachment *attachment; int rc; - OC_DEBUG(5, "[SOGo]"); - if (message_object) { wrapper = message_object; @@ -1077,8 +1036,6 @@ sogo_message_get_attachment_table (void *message_object, TALLOC_CTX *mem_ctx, vo MAPIStoreAttachmentTable *table; int rc; - OC_DEBUG(5, "[SOGo]"); - if (message_object) { wrapper = message_object; @@ -1116,9 +1073,6 @@ sogo_message_modify_recipients (void *message_object, MAPIStoreMessage *message; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (message_object) { wrapper = message_object; @@ -1152,9 +1106,6 @@ sogo_message_set_read_flag (void *message_object, uint8_t flag) MAPIStoreMessage *message; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (message_object) { wrapper = message_object; @@ -1186,9 +1137,6 @@ sogo_message_save (void *message_object, TALLOC_CTX *mem_ctx) MAPIStoreMessage *message; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (message_object) { wrapper = message_object; @@ -1220,9 +1168,6 @@ sogo_message_submit (void *message_object, enum SubmitFlags flags) MAPIStoreMailVolatileMessage *message; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (message_object) { wrapper = message_object; @@ -1259,9 +1204,6 @@ sogo_message_attachment_open_embedded_message (void *attachment_object, MAPIStoreEmbeddedMessage *message; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (attachment_object) { wrapper = attachment_object; @@ -1301,9 +1243,6 @@ sogo_message_attachment_create_embedded_message (void *attachment_object, MAPIStoreEmbeddedMessage *message; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (attachment_object) { wrapper = attachment_object; @@ -1338,9 +1277,6 @@ static enum mapistore_error sogo_table_get_available_properties(void *table_obje MAPIStoreTable *table; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (table_object) { wrapper = table_object; @@ -1371,9 +1307,6 @@ sogo_table_set_columns (void *table_object, uint16_t count, enum MAPITAGS *prope MAPIStoreTable *table; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (table_object) { wrapper = table_object; @@ -1405,9 +1338,6 @@ sogo_table_set_restrictions (void *table_object, struct mapi_SRestriction *restr MAPIStoreTable *table; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (table_object) { wrapper = table_object; @@ -1441,9 +1371,6 @@ sogo_table_set_sort_order (void *table_object, struct SSortOrderSet *sort_order, MAPIStoreTable *table; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (table_object) { wrapper = table_object; @@ -1479,9 +1406,6 @@ sogo_table_get_row (void *table_object, TALLOC_CTX *mem_ctx, MAPIStoreTable *table; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (table_object) { wrapper = table_object; @@ -1515,9 +1439,6 @@ sogo_table_get_row_count (void *table_object, MAPIStoreTable *table; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (table_object) { wrapper = table_object; @@ -1549,9 +1470,6 @@ sogo_table_handle_destructor (void *table_object, uint32_t handle_id) MAPIStoreTable *table; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (table_object) { wrapper = table_object; @@ -1584,9 +1502,6 @@ static enum mapistore_error sogo_properties_get_available_properties(void *objec MAPIStoreObject *propObject; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (object) { wrapper = object; @@ -1620,9 +1535,6 @@ sogo_properties_get_properties (void *object, MAPIStoreObject *propObject; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (object) { wrapper = object; @@ -1655,9 +1567,6 @@ sogo_properties_set_properties (void *object, struct SRow *aRow) MAPIStoreObject *propObject; int rc; - OC_DEBUG(5, "[SOGo]"); - - if (object) { wrapper = object; @@ -1691,8 +1600,6 @@ sogo_manager_generate_uri (TALLOC_CTX *mem_ctx, NSAutoreleasePool *pool; NSString *partialURLString, *username, *directory; - OC_DEBUG(5, "[SOGo]"); - if (uri == NULL) return MAPISTORE_ERR_INVALID_PARAMETER; /* This fixes a crash occurring during the instantiation of the