diff options
author | David Bremner <bremner@debian.org> | 2011-10-23 12:05:13 -0300 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2011-10-30 23:09:49 -0300 |
commit | 1dedfc90f6eee7cad10f1a1ceb39a7a1c4dbd1b1 (patch) | |
tree | 79cb128de2cf3a5249b2c31e0d319ed14134505e /lib/notmuch-private.h | |
parent | a1ca7e8ebb49ee92ebe8e4abe3db27491d7bbddf (diff) |
xutil.c: remove duplicate copies, create new library libutil.a to contain xutil.
We keep the lib/xutil.c version. As a consequence, also factor out
_internal_error and associated macros. It might be overkill to make a
new file error_util.c for this, but _internal_error does not really
belong in database.cc.
Diffstat (limited to 'lib/notmuch-private.h')
-rw-r--r-- | lib/notmuch-private.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/lib/notmuch-private.h b/lib/notmuch-private.h index d3195305..0d3cc27e 100644 --- a/lib/notmuch-private.h +++ b/lib/notmuch-private.h @@ -47,6 +47,7 @@ NOTMUCH_BEGIN_DECLS #include <talloc.h> #include "xutil.h" +#include "error_util.h" #pragma GCC visibility push(hidden) @@ -60,25 +61,6 @@ NOTMUCH_BEGIN_DECLS #define STRNCMP_LITERAL(var, literal) \ strncmp ((var), (literal), sizeof (literal) - 1) -/* There's no point in continuing when we've detected that we've done - * something wrong internally (as opposed to the user passing in a - * bogus value). - * - * Note that PRINTF_ATTRIBUTE comes from talloc.h - */ -int -_internal_error (const char *format, ...) PRINTF_ATTRIBUTE (1, 2); - -/* There's no point in continuing when we've detected that we've done - * something wrong internally (as opposed to the user passing in a - * bogus value). - * - * Note that __location__ comes from talloc.h. - */ -#define INTERNAL_ERROR(format, ...) \ - _internal_error (format " (%s).\n", \ - ##__VA_ARGS__, __location__) - #define unused(x) x __attribute__ ((unused)) #ifdef __cplusplus |