Index: ossp-pkg/l2/l2.h RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2.h,v rcsdiff -q -kk '-r1.15' '-r1.16' -u '/v/ossp/cvs/ossp-pkg/l2/Attic/l2.h,v' 2>/dev/null --- l2.h 2001/09/04 15:41:17 1.15 +++ l2.h 2001/09/04 19:18:49 1.16 @@ -129,13 +129,13 @@ /* channel handler specification structure */ struct l2_handler_st { l2_chtype_t type; - int (*create) (l2_context_t *ctx, l2_channel_t *ch); - int (*configure)(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap); - int (*open) (l2_context_t *ctx, l2_channel_t *ch); - int (*write) (l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t bufsize); - int (*flush) (l2_context_t *ctx, l2_channel_t *ch); - int (*close) (l2_context_t *ctx, l2_channel_t *ch); - int (*destroy) (l2_context_t *ctx, l2_channel_t *ch); + l2_result_t (*create) (l2_context_t *ctx, l2_channel_t *ch); + l2_result_t (*configure)(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap); + l2_result_t (*open) (l2_context_t *ctx, l2_channel_t *ch); + l2_result_t (*write) (l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t bufsize); + l2_result_t (*flush) (l2_context_t *ctx, l2_channel_t *ch); + l2_result_t (*close) (l2_context_t *ctx, l2_channel_t *ch); + l2_result_t (*destroy) (l2_context_t *ctx, l2_channel_t *ch); }; /* type of formatter callback function */ Index: ossp-pkg/l2/l2_ch_buffer.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_buffer.c,v rcsdiff -q -kk '-r1.12' '-r1.13' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_buffer.c,v' 2>/dev/null --- l2_ch_buffer.c 2001/09/04 15:41:17 1.12 +++ l2_ch_buffer.c 2001/09/04 19:18:49 1.13 @@ -40,7 +40,7 @@ } l2_ch_buffer_t; /* create channel */ -static int hook_create(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_create(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_buffer_t *cfg; @@ -60,7 +60,7 @@ } /* configure channel */ -static int hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) +static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) { l2_ch_buffer_t *cfg; l2_param_t pa[2]; @@ -80,7 +80,7 @@ } /* open channel */ -static int hook_open(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_open(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_buffer_t *cfg; l2_channel_t *downstream; @@ -105,7 +105,7 @@ } /* write to channel */ -static int hook_write(l2_context_t *ctx, l2_channel_t *ch, +static l2_result_t hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t bufsize) { l2_ch_buffer_t *cfg; @@ -124,7 +124,7 @@ } /* flush channel */ -static int hook_flush(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_flush(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_buffer_t *cfg; l2_channel_t *downstream; @@ -150,7 +150,7 @@ } /* close channel */ -static int hook_close(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_close(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_buffer_t *cfg; l2_channel_t *downstream; @@ -182,7 +182,7 @@ } /* destroy channel */ -static int hook_destroy(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_buffer_t *cfg; Index: ossp-pkg/l2/l2_ch_fd.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_fd.c,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_fd.c,v' 2>/dev/null --- l2_ch_fd.c 2001/09/04 15:41:17 1.5 +++ l2_ch_fd.c 2001/09/04 19:18:49 1.6 @@ -30,38 +30,38 @@ #include "l2.h" #include "l2_p.h" -static int hook_create(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_create(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) +static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) { return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_open(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *ch, +static l2_result_t hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_flush(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_close(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_destroy(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } Index: ossp-pkg/l2/l2_ch_file.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_file.c,v rcsdiff -q -kk '-r1.11' '-r1.12' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_file.c,v' 2>/dev/null --- l2_ch_file.c 2001/09/04 15:44:48 1.11 +++ l2_ch_file.c 2001/09/04 19:18:49 1.12 @@ -43,7 +43,7 @@ } l2_ch_file_t; /* create channel */ -static int hook_create(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_create(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_file_t *cfg; @@ -64,7 +64,7 @@ } /* configure channel */ -static int hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) +static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) { l2_ch_file_t *cfg; l2_param_t pa[4]; @@ -85,7 +85,7 @@ } /* open channel */ -static int hook_open(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_open(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_file_t *cfg; int mode; @@ -107,7 +107,7 @@ } /* write to channel */ -static int hook_write(l2_context_t *ctx, l2_channel_t *ch, +static l2_result_t hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t buf_size) { l2_ch_file_t *cfg; @@ -126,7 +126,7 @@ } /* flush channel */ -static int hook_flush(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_flush(l2_context_t *ctx, l2_channel_t *ch) { /* NOP for this channel, because Unix I/O files are unbuffered! */ @@ -134,7 +134,7 @@ } /* close channel */ -static int hook_close(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_close(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_file_t *cfg; @@ -152,7 +152,7 @@ } /* destroy channel */ -static int hook_destroy(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch) { /* parameter checks */ if (ctx->vp == NULL) Index: ossp-pkg/l2/l2_ch_filter.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_filter.c,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_filter.c,v' 2>/dev/null --- l2_ch_filter.c 2001/09/04 15:41:17 1.5 +++ l2_ch_filter.c 2001/09/04 19:18:49 1.6 @@ -30,38 +30,38 @@ #include "l2.h" #include "l2_p.h" -static int hook_create(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_create(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) +static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) { return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_open(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *ch, +static l2_result_t hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_flush(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_close(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_destroy(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } Index: ossp-pkg/l2/l2_ch_null.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_null.c,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_null.c,v' 2>/dev/null --- l2_ch_null.c 2001/09/04 15:41:17 1.5 +++ l2_ch_null.c 2001/09/04 19:18:49 1.6 @@ -30,37 +30,37 @@ #include "l2.h" #include "l2_p.h" -static int hook_create(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_create(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) +static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) { return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_open(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t buf_size) +static l2_result_t hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_flush(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_close(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_destroy(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } Index: ossp-pkg/l2/l2_ch_pipe.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_pipe.c,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_pipe.c,v' 2>/dev/null --- l2_ch_pipe.c 2001/09/04 15:41:17 1.5 +++ l2_ch_pipe.c 2001/09/04 19:18:49 1.6 @@ -30,38 +30,38 @@ #include "l2.h" #include "l2_p.h" -static int hook_create(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_create(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) +static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) { return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_open(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *ch, +static l2_result_t hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_flush(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_close(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_destroy(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } Index: ossp-pkg/l2/l2_ch_prefix.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_prefix.c,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_prefix.c,v' 2>/dev/null --- l2_ch_prefix.c 2001/09/04 15:41:17 1.5 +++ l2_ch_prefix.c 2001/09/04 19:18:49 1.6 @@ -30,38 +30,38 @@ #include "l2.h" #include "l2_p.h" -static int hook_create(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_create(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) +static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) { return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_open(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *ch, +static l2_result_t hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_flush(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_close(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } -static int hook_destroy(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch) { return L2_OK; } Index: ossp-pkg/l2/l2_ch_socket.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_socket.c,v rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_socket.c,v' 2>/dev/null --- l2_ch_socket.c 2001/09/04 15:44:48 1.9 +++ l2_ch_socket.c 2001/09/04 19:18:49 1.10 @@ -95,7 +95,7 @@ } l2_ch_socket_t; /* create channel */ -static int hook_create(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_create(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_socket_t *cfg = NULL; @@ -115,7 +115,7 @@ } /* configure channel */ -static int hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) +static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) { l2_ch_socket_t *cfg; l2_param_t pa[3]; @@ -135,7 +135,7 @@ } /* open channel */ -static int hook_open(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_open(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_socket_t *cfg; struct hostent *pHostentry; @@ -191,7 +191,7 @@ } /* write to channel */ -static int hook_write(l2_context_t *ctx, l2_channel_t *ch, +static l2_result_t hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t buf_size) { l2_ch_socket_t *cfg; @@ -210,7 +210,7 @@ } /* flush channel */ -static int hook_flush(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_flush(l2_context_t *ctx, l2_channel_t *ch) { /* NOP for this channel, because Unix I/O sockets are unbuffered! */ @@ -218,7 +218,7 @@ } /* close channel */ -static int hook_close(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_close(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_socket_t *cfg; @@ -236,7 +236,7 @@ } /* destroy channel */ -static int hook_destroy(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch) { /* parameter checks */ if (ctx->vp == NULL) Index: ossp-pkg/l2/l2_ch_syslog.c RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_ch_syslog.c,v rcsdiff -q -kk '-r1.11' '-r1.12' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_syslog.c,v' 2>/dev/null --- l2_ch_syslog.c 2001/09/04 15:44:48 1.11 +++ l2_ch_syslog.c 2001/09/04 19:18:49 1.12 @@ -42,7 +42,7 @@ } l2_ch_syslog_t; /* create channel */ -static int hook_create(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_create(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_syslog_t *cfg; @@ -64,7 +64,7 @@ } /* configure channel */ -static int hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) +static l2_result_t hook_configure(l2_context_t *ctx, l2_channel_t *ch, const char *fmt, va_list ap) { l2_ch_syslog_t *cfg; l2_param_t pa[3]; @@ -87,7 +87,7 @@ } /* open channel */ -static int hook_open(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_open(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_syslog_t *cfg; @@ -103,7 +103,7 @@ } /* write to channel */ -static int hook_write(l2_context_t *ctx, l2_channel_t *ch, +static l2_result_t hook_write(l2_context_t *ctx, l2_channel_t *ch, const char *buf, size_t buf_size) { l2_ch_syslog_t *cfg; @@ -119,7 +119,7 @@ } /* flush channel */ -static int hook_flush(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_flush(l2_context_t *ctx, l2_channel_t *ch) { /* Noop for this channel, because syslog entries are unbuffered */ @@ -127,7 +127,7 @@ } /* close channel */ -static int hook_close(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_close(l2_context_t *ctx, l2_channel_t *ch) { l2_ch_syslog_t *cfg; @@ -142,7 +142,7 @@ } /* destroy channel */ -static int hook_destroy(l2_context_t *ctx, l2_channel_t *ch) +static l2_result_t hook_destroy(l2_context_t *ctx, l2_channel_t *ch) { /* parameter checks */ if (ctx->vp == NULL)