summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorChristopher R. Hertel <crh@samba.org>1998-12-16 18:50:54 +0000
committerChristopher R. Hertel <crh@samba.org>1998-12-16 18:50:54 +0000
commitdc003d8d408b87eecba9044d2d8732a3604827bf (patch)
tree42bfc679602e1fb8423168a8ffd977a391b3da23 /source3/include
parent5377f7ab3b05a2d56d73f6721c4db5cd41d859dc (diff)
downloadsamba-dc003d8d408b87eecba9044d2d8732a3604827bf.tar.gz
samba-dc003d8d408b87eecba9044d2d8732a3604827bf.tar.bz2
samba-dc003d8d408b87eecba9044d2d8732a3604827bf.zip
A while back, Andrew and I talked about making the debug parsing code a
better "fit" with other Samba code. This is a small first step toward doing what (I think) we agreed to do. I've moved the key function from ubiqx/debugparse.c into lib/debug.c. I have also moved the enum from ubiqx/debugparse.h into the debug section in smb.h. The next thing to do is to get debug2html added into the Makefile.in so that it is always produced when compiling the suite. Chris -)----- (This used to be commit 782474f41e0c2bc0b1f098758a3e5cb44e87d8b1)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/include/smb.h21
3 files changed, 21 insertions, 3 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 824a5bde5d..a70de0b3a9 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -552,8 +552,6 @@ extern int errno;
#include "ubi_Cache.h"
#endif /* UBI_BINTREE_H */
-#include "debugparse.h"
-
#include "version.h"
#include "smb.h"
#include "smbw.h"
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8d966c6177..fc1e2926a8 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -172,6 +172,7 @@ void reopen_logs( void );
void force_check_log_size( void );
void dbgflush( void );
BOOL dbghdr( int level, char *file, char *func, int line );
+dbg_Token dbg_char2token( dbg_Token *state, int c );
/*The following definitions come from lib/domain_namemap.c */
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 9c699fc423..9cd74dd865 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -67,7 +67,8 @@ typedef int BOOL;
*/
/* I know the __attribute__ stuff is ugly, but it does ensure we get the
arguemnts to DEBUG() right. We have got them wrong too often in the
- past */
+ past.
+ */
#ifdef HAVE_STDARG_H
int Debug1( char *, ... )
#ifdef __GNUC__
@@ -127,6 +128,24 @@ BOOL dbgtext();
#define DEBUGADD( level, body ) \
(void)( (DEBUGLEVEL >= (level)) && (dbgtext body) )
+/* -------------------------------------------------------------------------- **
+ * 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;
+
/* End Debugging code section.
* -------------------------------------------------------------------------- **
*/