Changeset 1832 in ntrip

Timestamp:

May 7, 2009, 10:07:52 AM (16 years ago)

Author:

mervart

Message:

* empty log message *

File:

• trunk/BNC/RTCM3/RTCM3coDecoder.cpp (modified) (3 diffs)

trunk/BNC/RTCM3/RTCM3coDecoder.cpp

@@ -123 +123 @@
   errmsg.clear();
 
-//printf("Start with %d new bytes and %d old bytes\n", bufLen, _buffer.size());
-
   _buffer.append(QByteArray(buffer,bufLen));
 
   t_irc retCode = failure;
 
-  while(_buffer.size())
-  {
+  while(_buffer.size()) {
+
     int bytesused = 0;
-    struct ClockOrbit cox;
-    memcpy(&cox, &_co, sizeof(cox)); /* save state */
+    struct ClockOrbit co_sav;
+    memcpy(&co_sav, &_co, sizeof(co_sav)); // save state
 
     GCOB_RETURN irc = GetClockOrbitBias(&_co, &_bias, _buffer.data(),
                                         _buffer.size(), &bytesused);
 
-//printf("used %4d buffer %4d return %4d first byte %2x\n", bytesused, _buffer.size(), irc, (unsigned char)_buffer.data()[0]);
-    if(irc <= -30) /* not enough data found */
-    {
-      /* copy previous state back - necessary in case of MESSAGEFOLLOWS with
-         incomplete second block */
-      memcpy(&_co, &cox, sizeof(cox));
+    if      (irc <= -30) { // not enough data
+      memcpy(&_co, &co_sav, sizeof(co_sav));
       if (retCode != success) {
         _GPSweeks = -1.0;
@@ -149 +143 @@
       return retCode;
     }
-    else if(irc >= 0)
-    {
+
+    else if (irc >= 0) {  // OK or MESSAGEFOLLOWS
       _buffer = _buffer.mid(bytesused);
 
-      if(irc == GCOBR_OK) /* correctly and complete decoded */
-      {
+      if (irc == GCOBR_OK) { 
         reopen();
-
-//printf("TIME: gps %d glonass %d gps_tod %d\n", _co.GPSEpochTime, _co.GLONASSEpochTime, _co.GPSEpochTime%86400);
-
         int    GPSweek;
         currentGPSWeeks(GPSweek, _GPSweeks);
@@ -217 +207 @@
       }
     }
-    else /* error  - skip 1 byte and retry */
-    {
+
+    else { // error  - skip 1 byte and retry
       memset(&_co, 0, sizeof(_co));
       _buffer = _buffer.mid(1);
     }
   }
-//printf("Return with %d (success = %d) bytes %d\n", retCode, success, _buffer.size());
+
   return retCode;
 }