- Use tabs instead of spaces for indentation!

- Fix all sorts of ugly whitespace things.
- People, please write code according to our standards even if you don't
- like them.

diff --git a/ext/dio/dio.c b/ext/dio/dio.c
index c25a9b5ecb452d9f4d00a5af26f1b0c71b4ff633..2f69814e0482de6d31b570adad609e20f9ee3100 100644 (file)
--- a/ext/dio/dio.c
+++ b/ext/dio/dio.c
@@ -154,8 +154,7 @@ PHP_FUNCTION(dio_open)
 
        if (ZEND_NUM_ARGS() == 3) {
                fd = open(file_name, flags, mode);
-       }
-       else {
+       } else {
                fd = open(file_name, flags);
        }
 
@@ -420,11 +419,11 @@ PHP_FUNCTION(dio_tcsetattr)
        zval     *arg = NULL;
        php_fd_t *f;
        int       cmd;
-        struct termios newtio;
-        int Baud_Rate, Data_Bits=8, Stop_Bits=1, Parity=0;
+       struct termios newtio;
+       int Baud_Rate, Data_Bits=8, Stop_Bits=1, Parity=0;
        long BAUD,DATABITS,STOPBITS,PARITYON,PARITY;
-        HashTable      *fh;
-        zval          **element;
+       HashTable      *fh;
+       zval          **element;
         
        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &r_fd, &arg) == FAILURE) {
                return;
@@ -432,159 +431,145 @@ PHP_FUNCTION(dio_tcsetattr)
        ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
 
  
-        if (Z_TYPE_P(arg) != IS_ARRAY) {
-                zend_error(E_WARNING,"tcsetattr, third argument should be an associative array");
-                return;
-                
-        }
-        fh = HASH_OF(arg);
-        
-        
-        if (zend_hash_find(fh, "baud", sizeof("baud"), (void **) &element) == FAILURE) {
-                Baud_Rate   = 9600;
-        }
-        else {
-                Baud_Rate  = Z_LVAL_PP(element);
-        }
-        
-        
-        if (zend_hash_find(fh, "bits", sizeof("bits"), (void **) &element) == FAILURE) {
-                Data_Bits    = 8;
-        }
-        else {
-                Data_Bits  = Z_LVAL_PP(element);
-        }
+       if (Z_TYPE_P(arg) != IS_ARRAY) {
+               zend_error(E_WARNING,"tcsetattr, third argument should be an associative array");
+               return;
+       }
+
+       fh = HASH_OF(arg);
+
+       if (zend_hash_find(fh, "baud", sizeof("baud"), (void **) &element) == FAILURE) {
+               Baud_Rate = 9600;
+       } else {
+               Baud_Rate = Z_LVAL_PP(element);
+       }
+
+       if (zend_hash_find(fh, "bits", sizeof("bits"), (void **) &element) == FAILURE) {
+               Data_Bits = 8;
+       } else {
+               Data_Bits = Z_LVAL_PP(element);
+       }
+
+       if (zend_hash_find(fh, "stop", sizeof("stop"), (void **) &element) == FAILURE) {
+               Stop_Bits = 1;
+       } else {
+               Stop_Bits = Z_LVAL_PP(element);
+       } 
+
+       if (zend_hash_find(fh, "parity", sizeof("parity"), (void **) &element) == FAILURE) {
+               Parity = 0;
+       } else {
+               Parity = Z_LVAL_PP(element);
+       } 
+
+    /* assign to correct values... */
+    switch (Baud_Rate)  {
+               case 38400:            
+                       BAUD = B38400;
+                       break;
+               case 19200:
+                       BAUD = B19200;
+                       break;
+               case 9600:
+                       BAUD = B9600;
+                       break;
+               case 4800:
+                       BAUD = B4800;
+                       break;
+               case 2400:
+                       BAUD = B2400;
+                       break;
+               case 1800:
+                       BAUD = B1800;
+                       break;
+               case 1200:
+                       BAUD = B1200;
+                       break;
+               case 600:
+                       BAUD = B600;
+                       break;
+               case 300:
+                       BAUD = B300;
+                       break;
+               case 200:
+                       BAUD = B200;
+                       break;
+               case 150:
+                       BAUD = B150;
+                       break;
+               case 134:
+                       BAUD = B134;
+                       break;
+               case 110:
+                       BAUD = B110;
+                       break;
+               case 75:
+                       BAUD = B75;
+                       break;
+               case 50:
+                       BAUD = B50;
+                       break;
+               default:
+                       zend_error(E_WARNING, "invalid baud rate %d", Baud_Rate);
+                       RETURN_FALSE;
+       }
+       switch (Data_Bits) {
+               case 8:
+                       DATABITS = CS8;
+                       break;
+               case 7:
+                       DATABITS = CS7;
+                       break;
+               case 6:
+                       DATABITS = CS6;
+                       break;
+               case 5:
+                       DATABITS = CS5;
+                       break;
+               default:
+                       zend_error(E_WARNING, "invalid data bits %d", Data_Bits);
+                       RETURN_FALSE;
+       }   
+       switch (Stop_Bits) {
+               case 1:
+                       STOPBITS = 0;
+                       break;
+               case 2:
+                       STOPBITS = CSTOPB;
+                       break;
+               default:
+                       zend_error(E_WARNING, "invalid stop bits %d", Stop_Bits);
+                       RETURN_FALSE;
+       }   
+
+       switch (Parity) {
+               case 0:    
+                       PARITYON = 0;
+                       PARITY = 0;
+                       break;
+               case 1:                         
+                       PARITYON = PARENB;
+                       PARITY = PARODD;
+                       break;
+               case 2:                         
+                       PARITYON = PARENB;
+                       PARITY = 0;
+                       break;
+               default:
+                       zend_error(E_WARNING, "invalid parity %d", Parity);
+                       RETURN_FALSE;
+       }   
         
-        if (zend_hash_find(fh, "stop", sizeof("stop"), (void **) &element) == FAILURE) {
-                Stop_Bits    = 1;
-        }
-        else {
-                Stop_Bits  = Z_LVAL_PP(element);
-        } 
-
-        if (zend_hash_find(fh, "parity", sizeof("parity"), (void **) &element) == FAILURE) {
-                Parity    = 0;
-        }
-        else {
-                Parity  = Z_LVAL_PP(element);
-        } 
-
-        /* assign to correct values... */
-        switch (Baud_Rate)  {
-                 case 38400:
-                
-                    BAUD = B38400;
-                    break;
-                 case 19200:
-                    BAUD  = B19200;
-                    break;
-                 case 9600:
-                    BAUD  = B9600;
-                    break;
-                 case 4800:
-                    BAUD  = B4800;
-                    break;
-                 case 2400:
-                    BAUD  = B2400;
-                    break;
-                case 1800:
-                    BAUD  = B1800;
-                    break;
-                case 1200:
-                    BAUD  = B1200;
-                    break;
-                case 600:
-                    BAUD  = B600;
-                    break;
-                case 300:
-                    BAUD  = B300;
-                    break;
-                case 200:
-                    BAUD  = B200;
-                    break;
-                case 150:
-                    BAUD  = B150;
-                    break;
-                case 134:
-                    BAUD  = B134;
-                    break;
-                case 110:
-                    BAUD  = B110;
-                    break;
-                case 75:
-                    BAUD  = B75;
-                    break;
-                case 50:
-                    BAUD  = B50;
-                    break;
-                default:
-                        zend_error(E_WARNING, "invalid baud rate %d", Baud_Rate);
-                        RETURN_FALSE;
-        }
-        switch (Data_Bits) {
-                case 8:
-                    DATABITS = CS8;
-                    break;
-                case 7:
-                    DATABITS = CS7;
-                    break;
-                case 6:
-                    DATABITS = CS6;
-                    break;
-                case 5:
-                    DATABITS = CS5;
-                    break;
-                 default:
-                        zend_error(E_WARNING, "invalid data bits %d", Data_Bits);
-                        RETURN_FALSE;
-        }   
-        switch (Stop_Bits) {
-                 case 1:
-                    STOPBITS = 0;
-                    break;
-                 case 2:
-                    STOPBITS = CSTOPB;
-                    break;
-                default:
-                        zend_error(E_WARNING, "invalid stop bits %d", Stop_Bits);
-                        RETURN_FALSE;
-        }   
-        switch (Parity)
-              {
-                case 0:    
-                    PARITYON = 0;
-                    PARITY = 0;
-                    break;
-                case 1:                         
-                    PARITYON = PARENB;
-                    PARITY = PARODD;
-                    break;
-                case 2:                         
-                    PARITYON = PARENB;
-                    PARITY = 0;
-                    break;
-                default:
-                        zend_error(E_WARNING, "invalid parity %d", Parity);
-                        RETURN_FALSE;
-        }   
-            
-
-        newtio.c_cflag = BAUD | CRTSCTS | DATABITS | STOPBITS | PARITYON | PARITY | CLOCAL | CREAD;
-        newtio.c_iflag = IGNPAR;
-        newtio.c_oflag = 0;
-        newtio.c_lflag = 0;       /* ICANON; */
-        newtio.c_cc[VMIN]=1;
-        newtio.c_cc[VTIME]=0;
-        tcflush(f->fd, TCIFLUSH);
-        tcsetattr(f->fd,TCSANOW,&newtio);
-
-        RETURN_TRUE;
-
-
-
-
-  
-        
+       newtio.c_cflag = BAUD | CRTSCTS | DATABITS | STOPBITS | PARITYON | PARITY | CLOCAL | CREAD;
+       newtio.c_iflag = IGNPAR;
+       newtio.c_oflag = 0;
+       newtio.c_lflag = 0;       /* ICANON; */
+       newtio.c_cc[VMIN]=1;
+       newtio.c_cc[VTIME]=0;
+       tcflush(f->fd, TCIFLUSH);
+       tcsetattr(f->fd,TCSANOW,&newtio);
+
+       RETURN_TRUE;
 }
 /* }}} */