mirror of
https://git.notmuchmail.org/git/notmuch
synced 2024-11-24 20:08:10 +01:00
Move declarations for xutil.c from notmuch-private to new xutil.h.
The motivation here is that our top-level notmuch.c main program wants to start using these, but we don't want it to see into notmuch-private.h, (since our main program is a test vehicle for the "public" notmuch interface in notmuch.h).
This commit is contained in:
parent
0e914d9e96
commit
9ec5189a56
2 changed files with 45 additions and 16 deletions
|
@ -43,6 +43,7 @@ NOTMUCH_BEGIN_DECLS
|
||||||
|
|
||||||
#include <talloc.h>
|
#include <talloc.h>
|
||||||
|
|
||||||
|
#include "xutil.h"
|
||||||
|
|
||||||
/* Thanks to Andrew Tridgell's (SAMBA's) talloc for this definition of
|
/* Thanks to Andrew Tridgell's (SAMBA's) talloc for this definition of
|
||||||
* unlikely. The talloc source code comes to us via the GNU LGPL v. 3.
|
* unlikely. The talloc source code comes to us via the GNU LGPL v. 3.
|
||||||
|
@ -75,22 +76,6 @@ typedef enum {
|
||||||
NOTMUCH_VALUE_DATE = 2
|
NOTMUCH_VALUE_DATE = 2
|
||||||
} notmuch_value_t;
|
} notmuch_value_t;
|
||||||
|
|
||||||
/* xutil.c */
|
|
||||||
void *
|
|
||||||
xcalloc (size_t nmemb, size_t size);
|
|
||||||
|
|
||||||
void *
|
|
||||||
xmalloc (size_t size);
|
|
||||||
|
|
||||||
void *
|
|
||||||
xrealloc (void *ptrr, size_t size);
|
|
||||||
|
|
||||||
char *
|
|
||||||
xstrdup (const char *s);
|
|
||||||
|
|
||||||
char *
|
|
||||||
xstrndup (const char *s, size_t n);
|
|
||||||
|
|
||||||
/* message.cc */
|
/* message.cc */
|
||||||
|
|
||||||
notmuch_message_t *
|
notmuch_message_t *
|
||||||
|
|
44
xutil.h
Normal file
44
xutil.h
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
/* xutil.h - Various wrapper functions to abort on error.
|
||||||
|
*
|
||||||
|
* Copyright © 2009 Carl Worth
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see http://www.gnu.org/licenses/ .
|
||||||
|
*
|
||||||
|
* Author: Carl Worth <cworth@cworth.org>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef NOTMUCH_XUTIL_H
|
||||||
|
#define NOTMUCH_XUTIL_H
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <regex.h>
|
||||||
|
|
||||||
|
/* xutil.c */
|
||||||
|
void *
|
||||||
|
xcalloc (size_t nmemb, size_t size);
|
||||||
|
|
||||||
|
void *
|
||||||
|
xmalloc (size_t size);
|
||||||
|
|
||||||
|
void *
|
||||||
|
xrealloc (void *ptrr, size_t size);
|
||||||
|
|
||||||
|
char *
|
||||||
|
xstrdup (const char *s);
|
||||||
|
|
||||||
|
char *
|
||||||
|
xstrndup (const char *s, size_t n);
|
||||||
|
|
||||||
|
#endif
|
Loading…
Reference in a new issue