Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_random.c

Timestamp:

2012-02-28T13:59:00+13:00 (12 years ago)

Author:

kjdon

Message:

merged 64_bit_Greenstone branch into trunk, rev 25139

File:

• main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_random.c (modified) (16 diffs)

main/trunk/greenstone2/common-src/indexers/mg/lib/bitio_random.c

@@ -30 +30 @@
 
 void 
-BIO_Random_Start (FILE * f, unsigned long len,
+BIO_Random_Start (FILE * f, mg_u_long len,
           random_bitio_state * bs)
 {
@@ -64 +64 @@
 
 void 
-BIO_Random_Unary_Encode (unsigned long val, random_bitio_state * bs,
-             unsigned long *bits)
+BIO_Random_Unary_Encode (mg_u_long val, random_bitio_state * bs,
+             mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -76 +76 @@
 
 
-unsigned long 
+mg_u_long 
 BIO_Random_Unary_Decode (random_bitio_state * bs,
-             unsigned long *bits)
-{
-  register unsigned long val;
+             mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -97 +97 @@
 
 void 
-BIO_Random_Binary_Encode (unsigned long val, unsigned long b,
-              random_bitio_state * bs, unsigned long *bits)
+BIO_Random_Binary_Encode (mg_u_long val, mg_u_long b,
+              random_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -109 +109 @@
 
 
-unsigned long 
-BIO_Random_Binary_Decode (unsigned long b,
+mg_u_long 
+BIO_Random_Binary_Decode (mg_u_long b,
               random_bitio_state * bs,
-              unsigned long *bits)
-{
-  register unsigned long val;
+              mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -131 +131 @@
 
 void 
-BIO_Random_Gamma_Encode (unsigned long val, random_bitio_state * bs,
-             unsigned long *bits)
+BIO_Random_Gamma_Encode (mg_u_long val, random_bitio_state * bs,
+             mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -143 +143 @@
 
 
-unsigned long 
+mg_u_long 
 BIO_Random_Gamma_Decode (random_bitio_state * bs,
-             unsigned long *bits)
-{
-  register unsigned long val;
+             mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -161 +161 @@
 
 void 
-BIO_Random_Delta_Encode (unsigned long val, random_bitio_state * bs,
-             unsigned long *bits)
+BIO_Random_Delta_Encode (mg_u_long val, random_bitio_state * bs,
+             mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -173 +173 @@
 
 
-unsigned long 
+mg_u_long 
 BIO_Random_Delta_Decode (random_bitio_state * bs,
-             unsigned long *bits)
-{
-  register unsigned long val;
+             mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -188 +188 @@
 
 void 
-BIO_Random_Elias_Encode (unsigned long val, unsigned long b, double s,
-             random_bitio_state * bs, unsigned long *bits)
+BIO_Random_Elias_Encode (mg_u_long val, mg_u_long b, double s,
+             random_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -200 +200 @@
 
 
-unsigned long 
-BIO_Random_Elias_Decode (unsigned long b, double s,
+mg_u_long 
+BIO_Random_Elias_Decode (mg_u_long b, double s,
              random_bitio_state * bs,
-             unsigned long *bits)
-{
-  register unsigned long val;
+             mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -216 +216 @@
 
 void 
-BIO_Random_Bblock_Encode (unsigned long val, unsigned long b,
-              random_bitio_state * bs, unsigned long *bits)
+BIO_Random_Bblock_Encode (mg_u_long val, mg_u_long b,
+              random_bitio_state * bs, mg_u_long *bits)
 {
   ENCODE_CONTINUE (*bs)
@@ -228 +228 @@
 
 
-unsigned long 
-BIO_Random_Bblock_Decode (unsigned long b,
+mg_u_long 
+BIO_Random_Bblock_Decode (mg_u_long b,
               random_bitio_state * bs,
-              unsigned long *bits)
-{
-  register unsigned long val;
+              mg_u_long *bits)
+{
+  register mg_u_long val;
   DECODE_CONTINUE (*bs)
     if (bits)
@@ -244 +244 @@
 
 void 
-BIO_Random_Seek (unsigned long pos, random_bitio_state * bs)
+BIO_Random_Seek (mg_u_long pos, random_bitio_state * bs)
 {
   ENCODE_CONTINUE (*bs)
@@ -258 +258 @@
 }
 
-unsigned long 
+mg_u_long 
 BIO_Random_Tell (random_bitio_state * bs)
 {
-  register unsigned long t;
+  register mg_u_long t;
   ENCODE_CONTINUE (*bs)
     t = ENCODE_TELL;
@@ -278 +278 @@
     ((((pos)+7) >> 3) < (mg_ullong)(__base + __len)))
       {
-    __pos = (long)((pos) - (mg_ullong)(__base << 3));
+    __pos = (mg_s_long)((pos) - (mg_ullong)(__base << 3));
       }
     else
       {
         ENCODE_FLUSH;
-    __base = (long)(((pos) >> (__sft+3)) << __sft);
+    __base = (mg_s_long)(((pos) >> (__sft+3)) << __sft);
     
     fseek(__file,__base,0);
     fread(__buf,1,__len,__file);
-    __pos = (long)((pos) & ((8 << __sft)-1));
+    __pos = (mg_s_long)((pos) & ((8 << __sft)-1));
       }