Index: ossp-pkg/sio/sio.c
RCS File: /v/ossp/cvs/ossp-pkg/sio/sio.c,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/sio/sio.c,v' 2>/dev/null
--- sio.c	2002/11/05 13:23:36	1.4
+++ sio.c	2002/11/05 15:48:57	1.5
@@ -77,9 +77,9 @@
     sio_labelnum_t             label_error;
     sio_labelnum_t             label_eof;
 };
-#define SIO_LABEL_DATA(sio)  ((void*)&(sio)->label_data)
-#define SIO_LABEL_ERROR(sio) ((void*)&(sio)->label_error)
-#define SIO_LABEL_EOF(sio)   ((void*)&(sio)->label_eof)
+#define SIO_LABEL_DATA(sio)  ((al_label_t *)&(sio)->label_data)
+#define SIO_LABEL_ERROR(sio) ((al_label_t *)&(sio)->label_error)
+#define SIO_LABEL_EOF(sio)   ((al_label_t *)&(sio)->label_eof)
 
 struct sio_stage_st {
     sio_halfduplex_t reader;
@@ -497,12 +497,9 @@
     if (arc != AL_OK) return SIO_RC(SIO_ERR_INT);
 
     rc = sio_input(sio, al, n);
-    if (rc == AL_OK) {
+    if (rc == SIO_OK)
         arc = al_flatten(al, 0, n, AL_FORWARD_SPAN, SIO_LABEL_DATA(sio),
                          dst, actualp);
-        if (arc != AL_OK)
-            rc = SIO_ERR_INT;
-    }
 
     arc = al_destroy(al);
     if (arc != AL_OK) return SIO_RC(SIO_ERR_INT);