|
Check-in Number:
|
2732 | |
| Date: |
2002-Nov-05 16:48:57 (local)
2002-Nov-05 15:48:57 (UTC) |
| User: | mlelstv |
| Branch: | |
| Comment: |
code cleanup
PR:
Submitted by:
Reviewed by:
Approved by:
Obtained from: |
| Tickets: |
|
| Inspections: |
|
| Files: |
|
ossp-pkg/sio/sio.c 1.4 -> 1.5
--- 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);
|
|
