Changeset 1127 for trunk/src

Timestamp:

01/26/09 13:54:14 (3 years ago)

Author:

ludovic.rousseau

Message:

use #defined named NAD, PCB, LEN and DATA instead of hard coded numbers

File:

• trunk/src/ifd/proto-t1.c (modified) (6 diffs)

trunk/src/ifd/proto-t1.c

@@ -57 +57 @@
 
 #define T1_BUFFER_SIZE          (3 + 254 + 2)
+
+#define NAD 0
+#define PCB 1
+#define LEN 2
+#define DATA 3
 
 /* internal state, do not mess with it. */
@@ -236 +241 @@
                 }
 
-                pcb = sdata[1];
+                pcb = sdata[PCB];
                 switch (t1_block_type(pcb)) {
                 case T1_R_BLOCK:
@@ -293 +298 @@
                         t1->nr ^= 1;
 
-                        if (ct_buf_put(&rbuf, sdata + 3, sdata[2]) < 0)
+                        if (ct_buf_put(&rbuf, sdata + 3, sdata[LEN]) < 0)
                                 goto error;
 
@@ -329 +334 @@
                         case T1_S_IFS:
                                 ifd_debug(1, "CT sent S-block with ifs=%u",
-                                          sdata[3]);
-                                if (sdata[3] == 0)
+                                          sdata[DATA]);
+                                if (sdata[DATA] == 0)
                                         goto resync;
-                                t1->ifsc = sdata[3];
-                                ct_buf_putc(&tbuf, sdata[3]);
+                                t1->ifsc = sdata[DATA];
+                                ct_buf_putc(&tbuf, sdata[DATA]);
                                 break;
                         case T1_S_WTX:
@@ -339 +344 @@
                                  * yet */
                                 ifd_debug(1, "CT sent S-block with wtx=%u",
-                                          sdata[3]);
-                                t1->wtx = sdata[3];
-                                ct_buf_putc(&tbuf, sdata[3]);
+                                          sdata[DATA]);
+                                t1->wtx = sdata[DATA];
+                                ct_buf_putc(&tbuf, sdata[DATA]);
                                 break;
                         default:
@@ -622 +627 @@
                 if (t1_block_type(pcb) == T1_S_BLOCK &&
                     T1_S_TYPE(pcb) == T1_S_IFS && T1_S_IS_RESPONSE(pcb)) {
-                        if (sdata[2] != 1 || sdata[3] != ifsd)
+                        if (sdata[LEN] != 1 || sdata[DATA] != ifsd)
                                 goto error;
                         break;