alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* mu-util.h: fix catch-macro for the case where the GError is set already

Browse Source
This commit is contained in:
djcb
2012-03-30 19:02:07 +03:00
parent 7f0ec697d8
commit 2a105f1612
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mu-util.h
View File

@ -301,9 +301,10 @@ typedef gpointer XapianEnquire;
g_set_error ((GE),0,(E), "%s: xapian error '%s'", \ g_set_error ((GE),0,(E), "%s: xapian error '%s'", \
__FUNCTION__, xerr.get_msg().c_str()); \ __FUNCTION__, xerr.get_msg().c_str()); \
} catch (...) { \ } catch (...) { \
g_set_error ((GE),0,(MU_ERROR_INTERNAL), \ if ((GE)&&!(*(GE))) \
g_set_error ((GE),0,(MU_ERROR_INTERNAL), \
"%s: caught exception", __FUNCTION__); \ "%s: caught exception", __FUNCTION__); \
} }
#define MU_XAPIAN_CATCH_BLOCK_RETURN(R) \ #define MU_XAPIAN_CATCH_BLOCK_RETURN(R) \
@ -323,7 +324,8 @@ typedef gpointer XapianEnquire;
__FUNCTION__, xerr.get_msg().c_str()); \ __FUNCTION__, xerr.get_msg().c_str()); \
return (R); \ return (R); \
} catch (...) { \ } catch (...) { \
g_set_error ((GE),0,(MU_ERROR_INTERNAL), \ if ((GE)&&!(*(GE))) \
g_set_error ((GE),0,(MU_ERROR_INTERNAL), \
"%s: caught exception", __FUNCTION__); \ "%s: caught exception", __FUNCTION__); \
return (R); \ return (R); \
} }