--- l2_p.h 2001/11/04 13:21:17 1.26
+++ l2_p.h 2001/11/04 13:45:03 1.27
@@ -29,24 +29,35 @@
#ifndef __L2_P_H__
#define __L2_P_H__
+/* include standard headers */
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
-#ifndef DEBUG
-#define NDEBUG
-#endif
-#include <assert.h>
-
+/* include private headers */
#include "l2.h"
#include "l2_config.h"
+#include "l2_ut_format.h"
#include "l2_ut_pcre.h"
#include "l2_ut_sa.h"
+/* assertion and tracing support */
+#ifndef DEBUG
+#define NDEBUG
+#endif
+#include <assert.h>
+#ifndef NDEBUG
+#define TRACE(str) fprintf(stderr, "%s:%d: %s\n", __FILE__, __LINE__, str)
+#else
+#define TRACE(expr) ((void)0)
+#endif
+
+/* memory debugging support */
#if defined(HAVE_DMALLOC_H) && defined(WITH_DMALLOC)
#include "dmalloc.h"
#endif
+/* handy cleanup macros */
#define cu(value) \
do { rv = value; \
goto cus; } while (0)
@@ -54,18 +65,6 @@
if (expr) \
cu(value)
-#ifndef NDEBUG
-#define TRACE(str)\
- do {\
- fprintf(stderr, "%s:%d: ", __FILE__, __LINE__);\
- fprintf(stderr, str);\
- fputc('\n', stderr);\
- }\
- while (0)
-#else
-#define TRACE(expr) ((void)0)
-#endif
-
#define L2_MAX_MSGSIZE 4096
#define L2_MAX_CHANNELS 128
#define L2_MAX_FORMATTERS 128
@@ -122,46 +121,5 @@
#define _va_type_cast_voidptr void *
#define va_get(ap,type) (_va_type_cast_##type)va_arg((ap),_va_type_recv_##type)
-struct l2_util_format_st {
-
- /* the output buffer */
- char *curpos; /* start of output buffer (first pos) */
- char *endpos; /* end of output buffer (last pos) */
-
- /* callback for flushing the output buffer */
- int (*flush)(
- struct l2_util_format_st *spec /* this l2_util_format_t specification */
- );
-
- /* callback for formatting unknown %-constructs */
- void (*format)(
- struct l2_util_format_st *spec, /* this l2_util_format_t specification */
- char *prefix_char, /* output arg: prefix character */
- char *pad_char, /* output arg: padding character */
- char **s_buf, /* output arg: string buffer */
- size_t *s_len, /* output arg: string len */
- char *num_buf, /* input arg: temporary buffer */
- int num_buf_size, /* input arg: temporary buffer len */
- char *extinfo, /* input arg: extension information */
- char fmt_char, /* input arg: current formatting character */
- va_list *ap /* in/out arg: variable argument pointer */
- );
-
- /* arbitrary passed-through application data */
- union {
- int i;
- long l;
- double d;
- void *vp;
- } data[6];
-};
-typedef struct l2_util_format_st l2_util_format_t;
-
-int l2_util_format (l2_util_format_t *vbuff, const char *fmt, va_list ap);
-int l2_util_vsprintf (char *s, size_t n, const char *fmt, va_list ap);
-char *l2_util_vasprintf (const char *fmt, va_list ap);
-int l2_util_sprintf (char *s, size_t n, const char *fmt, ...);
-char *l2_util_asprintf (const char *fmt, ...);
-
#endif /* __L2_P_H__ */
|
