Changeset 25147 for main/trunk/greenstone2/common-src/indexers/mg/lib/perf_hash.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/perf_hash.c (modified) (7 diffs)

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

@@ -42 +42 @@
 
 /* Random Number stuff */
-static long seed[] = {0, 0};
+static mg_s_long seed[] = {0, 0};
 #define RANDOM() irandm(seed)
 #define SEED_RANDOM(the_seed) do{ seed[0] = the_seed; }while(0)
@@ -105 +105 @@
 
 #ifndef STRUCT
-static long **tb0, **tb1, **tb2;
+static mg_s_long **tb0, **tb1, **tb2;
 #else
 struct tb_entry **tb;
@@ -128 +128 @@
 {               /* deletes edge e from list of v */
 
-  int b;
-
+  int b, norm_b;
   b = FIRST[v];
   assert (norm (b) != 0);
@@ -700 +699 @@
     {
       if (tb0)
-    if (!(tb0[i] = Xmalloc (sizeof (long) * MAX_L)))
+    if (!(tb0[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
         ok = 0;
       if (tb1)
-    if (!(tb1[i] = Xmalloc (sizeof (long) * MAX_L)))
+    if (!(tb1[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
         ok = 0;
       if (tb2)
-    if (!(tb2[i] = Xmalloc (sizeof (long) * MAX_L)))
+    if (!(tb2[i] = Xmalloc (sizeof (mg_s_long) * MAX_L)))
         ok = 0;
     }
@@ -744 +743 @@
 
   if (r <= 0)
-    SEED_RANDOM ((long) time ((time_t *) NULL));
+    SEED_RANDOM ((mg_s_long) time ((time_t *) NULL));
   else
     SEED_RANDOM (r);
@@ -907 +906 @@
     {
       if (phd->tb0)
-    if (!(phd->tb0[i] = Xmalloc (sizeof (long) * phd->MAX_L)))
+    if (!(phd->tb0[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L)))
         ok = 0;
       if (phd->tb1)
-    if (!(phd->tb1[i] = Xmalloc (sizeof (long) * phd->MAX_L)))
+    if (!(phd->tb1[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L)))
         ok = 0;
       if (phd->tb2)
-    if (!(phd->tb2[i] = Xmalloc (sizeof (long) * phd->MAX_L)))
+    if (!(phd->tb2[i] = Xmalloc (sizeof (mg_s_long) * phd->MAX_L)))
         ok = 0;
     }
@@ -951 +950 @@
       int j;
 
-      tot += fread ((char *) phd->tb0[i], sizeof (long), phd->MAX_L, f) *
+      tot += fread ((char *) phd->tb0[i], sizeof (mg_s_long), phd->MAX_L, f) *
         sizeof (int);
-      tot += fread ((char *) phd->tb1[i], sizeof (long), phd->MAX_L, f) *
+      tot += fread ((char *) phd->tb1[i], sizeof (mg_s_long), phd->MAX_L, f) *
         sizeof (int);
-      tot += fread ((char *) phd->tb2[i], sizeof (long), phd->MAX_L, f) *
+      tot += fread ((char *) phd->tb2[i], sizeof (mg_s_long), phd->MAX_L, f) *
         sizeof (int);