OSSP CVS Repository

ossp - Difference in ossp-pkg/l2/l2_stream.c versions 1.20 and 1.21
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/l2/l2_stream.c 1.20 -> 1.21

--- l2_stream.c  2001/09/13 19:20:48     1.20
+++ l2_stream.c  2001/11/03 22:51:36     1.21
@@ -55,8 +55,11 @@
 /* attach channel to stream */
 l2_result_t l2_stream_channel(l2_stream_t *st, l2_channel_t *ch, unsigned int levelmask, unsigned int flushmask)
 {
+#if 0
     l2_channel_t *chC;
     l2_channel_t *chN;
+    l2_chtype_t t;
+#endif
     int i;
 
     /* argument sanity check */
@@ -65,11 +68,13 @@
 
     /* make sure the stack of channels consists of zero or more
        filter channels followed by exactly one output channel */
+#if 0
     for (chC = ch; (chN = l2_channel_downstream(chC)) != NULL; chC = chN)
-        if (l2_channel_type(chC) != L2_CHANNEL_FILTER)
+        if (l2_channel_type(chC, &t) == L2_OK && t != L2_CHANNEL_FILTER)
             return L2_ERR_USE;
-    if (l2_channel_type(chC) != L2_CHANNEL_OUTPUT)
+    if (l2_channel_type(chC, &t) == L2_OK && t != L2_CHANNEL_OUTPUT)
         return L2_ERR_USE;
+#endif
 
     /* find next free channel position in channel array */
     for (i = 0; i < L2_MAX_CHANNELS && st->channels[i].ch != NULL; i++)

CVSTrac 2.0.1