Index: trunk/ippdb/tests/alloc.c
===================================================================
--- trunk/ippdb/tests/alloc.c	(revision 11988)
+++ trunk/ippdb/tests/alloc.c	(revision 12026)
@@ -505,17 +505,17 @@
 
     {
-        p1PendingExpRow *object;
-
-        object = p1PendingExpRowAlloc("a string", -32, "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p1_version == -32) {
+        guidePendingExpRow *object;
+
+        object = guidePendingExpRowAlloc("a string", -32, "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -530,21 +530,21 @@
 
     {
-        p2PendingExpRow *object;
-
-        object = p2PendingExpRowAlloc("a string", -32, -32, "a string", "a string", "a string", "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p2_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p1_version == -32) {
+        chipPendingExpRow *object;
+
+        object = chipPendingExpRowAlloc("a string", -32, -32, "a string", "a string", "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->chip_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -571,21 +571,21 @@
 
     {
-        p2PendingImfileRow *object;
-
-        object = p2PendingImfileRowAlloc("a string", -32, -32, "a string", "a string", "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p2_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p1_version == -32) {
+        chipPendingImfileRow *object;
+
+        object = chipPendingImfileRowAlloc("a string", -32, -32, "a string", "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->chip_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -608,21 +608,21 @@
 
     {
-        p2ProcessedExpRow *object;
-
-        object = p2ProcessedExpRowAlloc("a string", -32, -32, "a string", "a string", "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p2_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p1_version == -32) {
+        chipProcessedExpRow *object;
+
+        object = chipProcessedExpRowAlloc("a string", -32, -32, "a string", "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->chip_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -645,7 +645,7 @@
 
     {
-        p2MaskRow       *object;
-
-        object = p2MaskRowAlloc("a string"    );
+        chipMaskRow     *object;
+
+        object = chipMaskRowAlloc("a string"    );
 
         if (!object) {
@@ -662,21 +662,21 @@
 
     {
-        p2ProcessedImfileRow *object;
-
-        object = p2ProcessedImfileRowAlloc("a string", -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string", -16    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p2_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p1_version == -32) {
+        chipProcessedImfileRow *object;
+
+        object = chipProcessedImfileRowAlloc("a string", -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, "a string", "a string", -16    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->chip_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->guide_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -723,21 +723,21 @@
 
     {
-        p3PendingExpRow *object;
-
-        object = p3PendingExpRowAlloc("a string", -32, -32, "a string", "a string", "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p3_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p2_version == -32) {
+        camPendingExpRow *object;
+
+        object = camPendingExpRowAlloc("a string", -32, -32, "a string", "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->cam_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->chip_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -760,21 +760,21 @@
 
     {
-        p3ProcessedExpRow *object;
-
-        object = p3ProcessedExpRowAlloc("a string", -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -16, "a string", "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p3_version == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p2_version == -32) {
+        camProcessedExpRow *object;
+
+        object = camProcessedExpRowAlloc("a string", -32, -32, "a string", "a string", "a string", 64.64, 64.64, 64.64, 32.32, 32.32, -32, "a string", "a string", 32.32, 32.32, -16, "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->cam_version == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->chip_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -849,7 +849,7 @@
 
     {
-        p3MaskRow       *object;
-
-        object = p3MaskRowAlloc("a string"    );
+        camMaskRow      *object;
+
+        object = camMaskRowAlloc("a string"    );
 
         if (!object) {
@@ -1460,13 +1460,13 @@
 
     {
-        p4RunRow        *object;
-
-        object = p4RunRowAlloc(-32, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p4_id == -32) {
+        warpRunRow      *object;
+
+        object = warpRunRowAlloc(-32, "a string", "a string", "a string", "a string", "0001-01-01T00:00:00Z"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->warp_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1496,21 +1496,21 @@
 
     {
-        p4InputExpRow   *object;
-
-        object = p4InputExpRowAlloc(-32, "a string", -32, true    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p4_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p3_version == -32) {
+        warpInputExpRow *object;
+
+        object = warpInputExpRowAlloc(-32, "a string", -32, true    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->warp_id == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (strncmp(object->exp_tag, "a string", MAX_STRING_LENGTH)) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->cam_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1525,13 +1525,13 @@
 
     {
-        p4SkyCellMapRow *object;
-
-        object = p4SkyCellMapRowAlloc(-32, "a string", "a string", "a string", -32, "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p4_id == -32) {
+        warpSkyCellMapRow *object;
+
+        object = warpSkyCellMapRowAlloc(-32, "a string", "a string", "a string", -32, "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->warp_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1549,5 +1549,5 @@
             exit(EXIT_FAILURE);
         }
-        if (!object->p3_version == -32) {
+        if (!object->cam_version == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1562,13 +1562,13 @@
 
     {
-        p4SkyfileRow    *object;
-
-        object = p4SkyfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p4_id == -32) {
+        warpSkyfileRow  *object;
+
+        object = warpSkyfileRowAlloc(-32, "a string", "a string", "a string", 64.64, 64.64    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->warp_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1599,13 +1599,13 @@
 
     {
-        p5RunRow        *object;
-
-        object = p5RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p5_id == -32) {
+        diffRunRow      *object;
+
+        object = diffRunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->diff_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1639,17 +1639,17 @@
 
     {
-        p5InputSkyfileRow *object;
-
-        object = p5InputSkyfileRowAlloc(-32, -32, "a string", "a string", "a string", true    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p5_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p4_id == -32) {
+        diffInputSkyfileRow *object;
+
+        object = diffInputSkyfileRowAlloc(-32, -32, "a string", "a string", "a string", true    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->diff_id == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->warp_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1676,13 +1676,13 @@
 
     {
-        p5DiffSkyfileRow *object;
-
-        object = p5DiffSkyfileRowAlloc(-32, "a string", 64.64, 64.64    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p5_id == -32) {
+        diffSkyfileRow  *object;
+
+        object = diffSkyfileRowAlloc(-32, "a string", 64.64, 64.64    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->diff_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1705,13 +1705,13 @@
 
     {
-        p6RunRow        *object;
-
-        object = p6RunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p6_id == -32) {
+        stackRunRow     *object;
+
+        object = stackRunRowAlloc(-32, "a string", "a string", "a string", "0001-01-01T00:00:00Z", "a string", "a string"    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->stack_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);
@@ -1745,34 +1745,34 @@
 
     {
-        p6InputSkyfileRow *object;
-
-        object = p6InputSkyfileRowAlloc(-32, -32    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p6_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-        if (!object->p4_id == -32) {
-            psFree(object);
-            exit(EXIT_FAILURE);
-        }
-
-        psFree(object);
-    }
-
-    {
-        p6SumSkyfileRow *object;
-
-        object = p6SumSkyfileRowAlloc(-32, "a string", 64.64, 64.64    );
-
-        if (!object) {
-            exit(EXIT_FAILURE);
-        }
-
-        if (!object->p6_id == -32) {
+        stackInputSkyfileRow *object;
+
+        object = stackInputSkyfileRowAlloc(-32, -32    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->stack_id == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+        if (!object->warp_id == -32) {
+            psFree(object);
+            exit(EXIT_FAILURE);
+        }
+
+        psFree(object);
+    }
+
+    {
+        stackSumSkyfileRow *object;
+
+        object = stackSumSkyfileRowAlloc(-32, "a string", 64.64, 64.64    );
+
+        if (!object) {
+            exit(EXIT_FAILURE);
+        }
+
+        if (!object->stack_id == -32) {
             psFree(object);
             exit(EXIT_FAILURE);