use the private header (which will use libreplace or system headers)
instead of direct includes of system includes
Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Rusty Russell <rusty@samba.org>
Autobuild-User(master): Christian Ambach <ambi@samba.org>
Autobuild-Date(master): Sat Dec 7 18:38:21 CET 2013 on sn-devel-104
#include <stdio.h>
#include <unistd.h>
#include <ccan/err/err.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
static void logfn(struct ntdb_context *ntdb,
enum ntdb_log_level level,
#include "config.h"
#include "ntdb.h"
-#include "system/filesys.h"
+#include "private.h"
#ifdef HAVE_GETOPT_H
#include <getopt.h>
*/
#include "config.h"
#include "ntdb.h"
-#ifdef HAVE_LIBREPLACE
-#include <replace.h>
-#include <system/filesys.h>
-#include <system/locale.h>
-#else
-#include <ctype.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
-#endif
+#include "private.h"
static void print_data(NTDB_DATA d)
{
#include "config.h"
#include "ntdb.h"
+#include "private.h"
#include <assert.h>
-#ifdef HAVE_LIBREPLACE
-#include <replace.h>
-#include <system/filesys.h>
-#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#endif
static int read_linehead(FILE *f)
{
#include "config.h"
#include "ntdb.h"
-#ifdef HAVE_LIBREPLACE
-#include <replace.h>
-#include <system/filesys.h>
-#include <system/time.h>
-#include <system/locale.h>
-#else
-#include <stdlib.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <stdarg.h>
-#endif
+#include "private.h"
static int do_command(void);
const char *cmdname;
#include "config.h"
#include "ntdb.h"
+#include "private.h"
#include <ccan/err/err.h>
-#ifdef HAVE_LIBREPLACE
-#include <replace.h>
-#else
-#include <stdlib.h>
-#include <getopt.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <fcntl.h>
-#include <time.h>
-#include <sys/wait.h>
-#endif
//#define REOPEN_PROB 30
#define DELETE_PROB 8
/* Simple speed test for NTDB */
#include <ccan/err/err.h>
#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <unistd.h>
#include <sys/time.h>
#include <fcntl.h>