Index: ossp-pkg/l2/l2.h RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2.h,v rcsdiff -q -kk '-r1.5' '-r1.6' -u '/v/ossp/cvs/ossp-pkg/l2/Attic/l2.h,v' 2>/dev/null --- l2.h 2001/05/24 09:40:28 1.5 +++ l2.h 2001/05/26 08:02:55 1.6 @@ -120,10 +120,10 @@ struct l2_handler_st { int (*create) (l2_context_t *ctx); int (*configure)(l2_context_t *ctx, const char *fmt, va_list ap); - int (*open) (l2_context_t *ctx, l2_channel_t *below); - int (*write) (l2_context_t *ctx, l2_channel_t *below, const char *buf, size_t buf_size); - int (*flush) (l2_context_t *ctx, l2_channel_t *below); - int (*close) (l2_context_t *ctx, l2_channel_t *below); + int (*open) (l2_context_t *ctx, l2_channel_t *downstream); + int (*write) (l2_context_t *ctx, l2_channel_t *downstream, const char *buf, size_t buf_size); + int (*flush) (l2_context_t *ctx, l2_channel_t *downstream); + int (*close) (l2_context_t *ctx, l2_channel_t *downstream); int (*destroy) (l2_context_t *ctx); }; 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.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_fd.c,v' 2>/dev/null --- l2_ch_fd.c 2001/05/11 17:07:52 1.2 +++ l2_ch_fd.c 2001/05/26 08:02:55 1.3 @@ -40,23 +40,23 @@ return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *below) +static int hook_open(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *below, +static int hook_write(l2_context_t *ctx, l2_channel_t *downstream, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *below) +static int hook_flush(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *below) +static int hook_close(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } 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.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_filter.c,v' 2>/dev/null --- l2_ch_filter.c 2001/05/11 17:07:52 1.2 +++ l2_ch_filter.c 2001/05/26 08:02:55 1.3 @@ -40,23 +40,23 @@ return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *below) +static int hook_open(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *below, +static int hook_write(l2_context_t *ctx, l2_channel_t *downstream, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *below) +static int hook_flush(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *below) +static int hook_close(l2_context_t *ctx, l2_channel_t *downstream) { 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.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_null.c,v' 2>/dev/null --- l2_ch_null.c 2001/05/11 17:07:52 1.2 +++ l2_ch_null.c 2001/05/26 08:02:55 1.3 @@ -40,23 +40,23 @@ return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *below) +static int hook_open(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *below, +static int hook_write(l2_context_t *ctx, l2_channel_t *downstream, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *below) +static int hook_flush(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *below) +static int hook_close(l2_context_t *ctx, l2_channel_t *downstream) { 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.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_pipe.c,v' 2>/dev/null --- l2_ch_pipe.c 2001/05/11 17:07:52 1.2 +++ l2_ch_pipe.c 2001/05/26 08:02:55 1.3 @@ -40,23 +40,23 @@ return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *below) +static int hook_open(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *below, +static int hook_write(l2_context_t *ctx, l2_channel_t *downstream, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *below) +static int hook_flush(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *below) +static int hook_close(l2_context_t *ctx, l2_channel_t *downstream) { 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.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_prefix.c,v' 2>/dev/null --- l2_ch_prefix.c 2001/05/11 17:07:52 1.2 +++ l2_ch_prefix.c 2001/05/26 08:02:55 1.3 @@ -40,23 +40,23 @@ return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *below) +static int hook_open(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *below, +static int hook_write(l2_context_t *ctx, l2_channel_t *downstream, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *below) +static int hook_flush(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *below) +static int hook_close(l2_context_t *ctx, l2_channel_t *downstream) { 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.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_socket.c,v' 2>/dev/null --- l2_ch_socket.c 2001/05/11 17:07:52 1.2 +++ l2_ch_socket.c 2001/05/26 08:02:55 1.3 @@ -40,23 +40,23 @@ return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *below) +static int hook_open(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *below, +static int hook_write(l2_context_t *ctx, l2_channel_t *downstream, const char *buf, size_t buf_size) { return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *below) +static int hook_flush(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *below) +static int hook_close(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } 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.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_syslog.c,v' 2>/dev/null --- l2_ch_syslog.c 2001/05/17 14:42:00 1.3 +++ l2_ch_syslog.c 2001/05/26 08:02:55 1.4 @@ -42,24 +42,24 @@ return L2_OK; } -static int hook_open(l2_context_t *ctx, l2_channel_t *below) +static int hook_open(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_write(l2_context_t *ctx, l2_channel_t *below, +static int hook_write(l2_context_t *ctx, l2_channel_t *downstream, const char *buf, size_t buf_size) { syslog(LOG_INFO, buf); return L2_OK; } -static int hook_flush(l2_context_t *ctx, l2_channel_t *below) +static int hook_flush(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } -static int hook_close(l2_context_t *ctx, l2_channel_t *below) +static int hook_close(l2_context_t *ctx, l2_channel_t *downstream) { return L2_OK; } Index: ossp-pkg/l2/l2_stream.c RCS File: /v/ossp/cvs/ossp-pkg/l2/Attic/l2_stream.c,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/ossp-pkg/l2/Attic/l2_stream.c,v' 2>/dev/null --- l2_stream.c 2001/05/22 18:47:31 1.3 +++ l2_stream.c 2001/05/26 08:02:55 1.4 @@ -79,7 +79,7 @@ len = vsnprintf(st->message, L2_MAX_MSGSIZE, fmt, ap); for (i = 0; i <= L2_MAX_CHANNELS && st->channels[i] != NULL; i++) st->channels[i]->handler.write(&st->channels[i]->context, - st->channels[i]->below, + st->channels[i]->downstream, st->message, len); return; }