Still moving things around. debugparse.h will be removed from the include

directory in the next batch.  Chris -)-----

diff --git a/source/include/debugparse.h b/source/include/debugparse.h
deleted file mode 100644 (file)
index 9827c43..0000000
--- a/source/include/debugparse.h
+++ /dev/null
@@ -1,78 +0,0 @@
-#ifndef DEBUGPARSE_H
-#define DEBUGPARSE_H
-/* ========================================================================== **
- *                                debugparse.c
- *
- * Copyright (C) 1998 by Christopher R. Hertel
- *
- * Email: crh@ubiqx.mn.org
- *
- * -------------------------------------------------------------------------- **
- * This module is a very simple parser for Samba debug log files.
- * -------------------------------------------------------------------------- **
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Library General Public
- *  License as published by the Free Software Foundation; either
- *  version 2 of the License, or (at your option) any later version.
- *
- *  This library 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
- *  Library General Public License for more details.
- *
- *  You should have received a copy of the GNU Library General Public
- *  License along with this library; if not, write to the Free
- *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * -------------------------------------------------------------------------- **
- * The important function in this module is dbg_char2token().  The rest is
- * basically fluff.  (Potentially useful fluff, but still fluff.)
- *
- * NOTE:  Use this header if you are compiling with Samba headers.  See
- *        debugparse-nonsamba.h for an alternate version.
- *
- * -------------------------------------------------------------------------- **
- *
- * $Log: debugparse.h,v $
- * Revision 1.2  1998/10/28 17:51:48  jra
- * Quick fixes to fix the broken tree. Needed for my morning compiles.
- * Chris - feel free to fix these things differently if these fixes don't
- * work for you.
- * Jeremy.
- *
- * Revision 1.1  1998/10/26 23:21:37  crh
- * Here is the simple debug parser and the debug2html converter.  Still to do:
- *
- *   * Debug message filtering.
- *   * I need to add all this to Makefile.in
- *     (If it looks at all strange I'll ask for help.)
- *
- * If you want to compile debug2html, you'll need to do it by hand until I
- * make the changes to Makefile.in.  Sorry.
- *
- * Chris -)-----
- *
- * ========================================================================== **
- */
-
-/* -------------------------------------------------------------------------- **
- * These are the tokens returned by dbg_char2token().
- */
-
-typedef enum
-  {
-  dbg_null = 0,
-  dbg_ignore,
-  dbg_header,
-  dbg_timestamp,
-  dbg_level,
-  dbg_sourcefile,
-  dbg_function,
-  dbg_lineno,
-  dbg_message,
-  dbg_eof
-  } dbg_Token;
-
-/* -------------------------------------------------------------------------- */
-#endif /* DEBUGPARSE_H */

diff --git a/source/include/includes.h b/source/include/includes.h
index 1477c3ab3d5bbcbb4fd2602c43cf609ac2c5c7e3..56ab47cecc41e1417c4517920b8a253372ce58b4 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -482,6 +482,8 @@ extern int errno;
 #include "ubi_Cache.h"
 #endif /* UBI_BINTREE_H */
 
+#include "debugparse.h"
+
 #include "version.h"
 #include "smb.h"
 #include "smbw.h"
@@ -494,8 +496,6 @@ extern int errno;
 
 #include "nterr.h"
 
-#include "debugparse.h"
-
 #ifndef MAXCODEPAGELINES
 #define MAXCODEPAGELINES 256
 #endif

diff --git a/source/include/proto.h b/source/include/proto.h
index 807ee0fbab206a9f9ff3097551e7a3546d251419..190bf5f615774ea06159f67e850f568cadd9afce 100644 (file)
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -84,11 +84,6 @@ void force_check_log_size( void );
 void dbgflush( void );
 BOOL dbghdr( int level, char *file, char *func, int line );
 
-/*The following definitions come from  lib/debugparse.c  */
-
-char *dbg_token2string( dbg_Token tok );
-void dbg_test( void );
-
 /*The following definitions come from  lib/fault.c  */
 
 void fault_setup(void (*fn)(void *));