Index: trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h
===================================================================
--- trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 10215)
+++ trunk/BNC/src/RTCM3/clock_and_orbit/clock_orbit.h	(revision 10224)
@@ -16,4 +16,5 @@
 #include <math.h>
 #include "t_prn.h"
+#include "bncutils.h"
 
 enum IGS_NUMBERS {
@@ -422,6 +423,6 @@
 #define STARTDATA \
   size_t ressize=0; \
-  char *blockstart; \
-  int numbits; \
+  char *blockstart=0; \
+  int numbits=0; \
   uint64_t bitbuffer=0;
 
@@ -518,18 +519,4 @@
 #define T_VTEC_QUALITY_INDICATOR(a)      SCALEADDBITS( 9,       20.0, a) /* DF478, IDF041 */
 
-static uint32_t CRC24(long size, const unsigned char *buf) {
-  uint32_t crc = 0;
-  int ii;
-  while (size--) {
-    crc ^= (*buf++) << (16);
-    for (ii = 0; ii < 8; ii++)  {
-      crc <<= 1;
-      if (crc & 0x1000000)
-        crc ^= 0x01864cfb;
-    }
-  }
-  return crc;
-}
-
 static double URAToValue(int ura) {
   int urac, urav;