Index: ossp-pkg/l2/l2.h.in RCS File: /v/ossp/cvs/ossp-pkg/l2/l2.h.in,v rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/ossp-pkg/l2/l2.h.in,v' 2>/dev/null --- l2.h.in 2001/09/13 19:20:48 1.9 +++ l2.h.in 2001/09/25 15:22:21 1.10 @@ -200,6 +200,8 @@ l2_result_t l2_channel_stack (l2_channel_t *ch, l2_channel_t *chTop); l2_channel_t *l2_channel_downstream (l2_channel_t *ch); l2_chtype_t l2_channel_type (l2_channel_t *ch); +l2_result_t l2_channel_errorinfo (l2_channel_t *ch, l2_result_t rv, const char *fmt, ...); +char *l2_channel_strerror (l2_channel_t *ch, l2_result_t rv); /* stream operations */ l2_stream_t *l2_stream_create (void); 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.15' '-r1.16' -u '/v/ossp/cvs/ossp-pkg/l2/l2_ch_pipe.c,v' 2>/dev/null --- l2_ch_pipe.c 2001/09/24 14:36:34 1.15 +++ l2_ch_pipe.c 2001/09/25 15:22:21 1.16 @@ -58,16 +58,16 @@ int iStatus = 0; /* for wait() */ if (sig == SIGCHLD) { - TRACE("SIGCHLD caught\n"); + TRACE("SIGCHLD caught"); Pid = waitpid(-1, &iStatus, WUNTRACED); if (WIFEXITED(iStatus)) - TRACE("EXITED child\n"); /* child finished and returned */ + TRACE("EXITED child"); /* child finished and returned */ else if (WIFSIGNALED(iStatus)) - TRACE("SIGNALED child\n"); /* child finished due to a signal */ + TRACE("SIGNALED child"); /* child finished due to a signal */ else if (WIFSTOPPED(iStatus)) - TRACE("STOPPED child\n"); /* child stopped due to a signal */ + TRACE("STOPPED child"); /* child stopped due to a signal */ else - TRACE("Unknown SIGNAL\n"); /* child stopped due to a signal */ + TRACE("Unknown SIGNAL"); /* child stopped due to a signal */ } else if (sig == SIGPIPE); /* noop for now */ } Index: ossp-pkg/l2/l2_p.h RCS File: /v/ossp/cvs/ossp-pkg/l2/l2_p.h,v rcsdiff -q -kk '-r1.21' '-r1.22' -u '/v/ossp/cvs/ossp-pkg/l2/l2_p.h,v' 2>/dev/null --- l2_p.h 2001/09/24 15:36:23 1.21 +++ l2_p.h 2001/09/25 15:22:21 1.22 @@ -56,8 +56,11 @@ #ifndef NDEBUG #define TRACE(str)\ - do\ - fprintf(stderr, "%s:%d: %s\n", __FILE__, __LINE__, str);\ + do {\ + fprintf(stderr, "%s:%d: ", __FILE__, __LINE__);\ + fprintf(stderr, str);\ + fputc('\n', stderr);\ + }\ while (0) #else #define TRACE(expr) ((void)0)