[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-97-ge93a2ca

[Julien B a. A. <ar...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  e93a2cabe08226b698c96dc03dc6b2cbe90dda10 (commit)
       via  590ddad17a941c79076861dbf1d59ca0b95036c7 (commit)
      from  35af32c73f8b5c0c3013d6459ed869eaee656131 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e93a2cabe08226b698c96dc03dc6b2cbe90dda10
Merge: 590ddad 35af32c
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Mar 5 10:42:23 2012 +0100

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 590ddad17a941c79076861dbf1d59ca0b95036c7
Author: Julien Boibessot <jul...@ar...>
Date:   Mon Mar 5 09:31:50 2012 +0100

    [DEMOS] GPS: memset() fix + cleanup

-----------------------------------------------------------------------

Summary of changes:
 target/demos/gps/nmea_decoder.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/demos/gps/nmea_decoder.c b/target/demos/gps/nmea_decoder.c
index 6de61c5..b7b7277 100644
--- a/target/demos/gps/nmea_decoder.c
+++ b/target/demos/gps/nmea_decoder.c
@@ -44,7 +44,7 @@ int openSerialPort(char* aDeviceName, int aSpeed)
     }
 
     tcgetattr(fd, &oldtio); /* save current serial port settings */
-    memset(&newtio, sizeof(newtio), 0); /* clear struct for new port settings */
+    memset(&newtio, 0, sizeof(newtio)); /* clear struct for new port settings */
 // newtio.c_cflag = BAUDRATE | CRTSCTS | CS8 | CLOCAL | CREAD; 
     newtio.c_cflag = aSpeed | CS8 | CLOCAL | CREAD;  /* _no_ CRTSCTS */
     newtio.c_iflag = IGNPAR; //  | ICRNL |IXON; 
@@ -97,7 +97,7 @@ int waitForData(int fd)
     tv.tv_usec = 0;
 
     retval = select(fd+1, &fds, NULL, NULL, &tv);
-//    retval = FD_ISSET(fd,&rfds);
+/*    retval = FD_ISSET(fd,&rfds); */
 
     return retval;
 }
@@ -236,14 +236,14 @@ int main(int argc, char **argv)
                 else
                     fprintf(stderr, "Unknown option character `\\x%x'.\n", optopt);
                 showUsage();
-                //exit(1);
+                /* intentionnaly no break to go to next step (abort) */
 
             default:
-                abort ();
+                abort();
         }
     }
 
-    //printf ("device = %s, speed = %s, cvalue = %s\n", device, str_speed, cvalue);
+    /*printf ("device = %s, speed = %s, cvalue = %s\n", device, str_speed, cvalue);*/
 
     for (index = optind; index < argc; index++)
         printf ("Non-option argument %s\n", argv[index]);


hooks/post-receive
-- 
armadeus