From 951a897040937e16252263ad782bd5e52af17be3 Mon Sep 17 00:00:00 2001
From: Sears Russell <sears@cs.berkeley.edu>
Date: Thu, 31 May 2007 22:40:19 +0000
Subject: [PATCH] Add casts to prevent warnings on (upcoming changes to)
 recordRead, recordWrite

---
 src/lladd/operations/decrement.c |  4 ++--
 src/lladd/operations/increment.c |  4 ++--
 test/lladd/check_bufferManager.c |  8 ++++----
 test/lladd/check_operations.c    | 20 ++++++++++----------
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/lladd/operations/decrement.c b/src/lladd/operations/decrement.c
index e66d62a..bcce519 100644
--- a/src/lladd/operations/decrement.c
+++ b/src/lladd/operations/decrement.c
@@ -51,9 +51,9 @@ terms specified in this license.
 static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {
 	int i;
 
-	recordRead(xid, p, r, &i);
+	recordRead(xid, p, r, (byte*)&i);
 	i--;
-	recordWrite(xid, p, lsn, r, &i);
+	recordWrite(xid, p, lsn, r, (byte*)&i);
 	
 	return 0;
 }
diff --git a/src/lladd/operations/increment.c b/src/lladd/operations/increment.c
index 1740140..41a5ee7 100644
--- a/src/lladd/operations/increment.c
+++ b/src/lladd/operations/increment.c
@@ -51,9 +51,9 @@ terms specified in this license.
 static int operate(int xid, Page * p, lsn_t lsn, recordid r, const void *d) {
 	int i;
 
-	recordRead(xid, p, r, &i);
+	recordRead(xid, p, r, (byte*)&i);
 	i++;
-	recordWrite(xid, p, lsn, r, &i);
+	recordWrite(xid, p, lsn, r, (byte*)&i);
 	
 	return 0;
 }
diff --git a/test/lladd/check_bufferManager.c b/test/lladd/check_bufferManager.c
index ddc319a..be730cd 100644
--- a/test/lladd/check_bufferManager.c
+++ b/test/lladd/check_bufferManager.c
@@ -57,7 +57,7 @@ void initializePages() {
     assert(p->id != -1); 
     slottedPostRalloc(-1, p, 0, rid);
 
-    recordWrite(1, p, 1, rid, &i);
+    recordWrite(1, p, 1, rid, (byte*)&i);
 
     p->LSN = 0;
     *lsn_ptr(p) = 0;
@@ -87,7 +87,7 @@ void * workerThread(void * p) {
 
     p = loadPage(-1, rid.page);
     
-    recordRead(1, p, rid, &j);
+    recordRead(1, p, rid, (byte*)&j);
 
     releasePage(p);
 
@@ -138,7 +138,7 @@ void * workerThreadWriting(void * q) {
     }
     
     /*    sched_yield(); */
-    recordWrite(1, p, 0, rids[i], &val); 
+    recordWrite(1, p, 0, rids[i], (byte*)&val); 
 
     assert(p->id == rids[i].page);
     /*    p->LSN = 0;
@@ -159,7 +159,7 @@ void * workerThreadWriting(void * q) {
 
     p = loadPage(xid, rids[i].page);
 
-    recordRead(1, p, rids[i], &val); 
+    recordRead(1, p, rids[i], (byte*)&val); 
 
     /*    p->LSN = 0;
      *lsn_ptr(p) = 0;  */
diff --git a/test/lladd/check_operations.c b/test/lladd/check_operations.c
index 0361883..9e612ae 100644
--- a/test/lladd/check_operations.c
+++ b/test/lladd/check_operations.c
@@ -90,7 +90,7 @@ START_TEST(operation_physical_do_undo) {
   DEBUG("B\n");
   
   p = loadPage(xid, rid.page);
-  recordWrite(xid, p, lsn, rid, &buf);
+  recordWrite(xid, p, lsn, rid, (byte*)&buf);
   releasePage(p);
   setToTwo->LSN = 10;
   
@@ -100,7 +100,7 @@ START_TEST(operation_physical_do_undo) {
   releasePage(p);
 
   p = loadPage(xid, rid.page);
-  recordRead(xid, p, rid, &buf);
+  recordRead(xid, p, rid, (byte*)&buf);
   releasePage(p);
 
   fail_unless(buf == 2, NULL);
@@ -118,7 +118,7 @@ START_TEST(operation_physical_do_undo) {
   releasePage(p);
 
   p = loadPage(xid, rid.page);
-  recordRead(xid, p, rid, &buf);
+  recordRead(xid, p, rid, (byte*)&buf);
   releasePage(p);
 
   fail_unless(buf == 1, NULL);
@@ -128,7 +128,7 @@ START_TEST(operation_physical_do_undo) {
   
 
   p = loadPage(xid, rid.page);
-  recordRead(xid, p, rid, &buf);
+  recordRead(xid, p, rid, (byte*)&buf);
   releasePage(p);
 
   fail_unless(buf == 1, NULL);
@@ -147,7 +147,7 @@ START_TEST(operation_physical_do_undo) {
   buf = 1;
 
   p = loadPage(xid, rid.page);
-  recordWrite(xid, p, lsn, rid, &buf);
+  recordWrite(xid, p, lsn, rid, (byte*)&buf);
   releasePage(p);
   /* Trace of test: 
 
@@ -175,14 +175,14 @@ START_TEST(operation_physical_do_undo) {
   redoUpdate(setToTwo);
 
   p = loadPage(xid, rid.page);
-  recordRead(xid, p, rid, &buf);
+  recordRead(xid, p, rid, (byte*)&buf);
   assert(buf == 2);
   fail_unless(buf == 2, NULL);
 
   DEBUG("G undo set to 2\n");
   undoUpdate(setToTwo, p, 20);        /* Succeeds -- 20 is the 'CLR' entry's lsn.*/
 
-  recordRead(xid, p, rid, &buf);
+  recordRead(xid, p, rid, (byte*)&buf);
 
   fail_unless(buf == 1, NULL);
   releasePage(p);
@@ -192,18 +192,18 @@ START_TEST(operation_physical_do_undo) {
 
   p = loadPage(xid, rid.page);
 
-  recordRead(xid, p, rid, &buf);
+  recordRead(xid, p, rid, (byte*)&buf);
 
   fail_unless(buf == 1, NULL);
   
-  recordWrite(xid, p, 0, rid, &buf); /* reset the page's LSN. */
+  recordWrite(xid, p, 0, rid, (byte*)&buf); /* reset the page's LSN. */
 
   DEBUG("I redo set to 2\n");
 
   releasePage(p);
   redoUpdate(setToTwo);        /* Succeeds */
   p = loadPage(xid, rid.page);
-  recordRead(xid, p, rid, &buf);
+  recordRead(xid, p, rid, (byte*)&buf);
 
   fail_unless(buf == 2, NULL);
   releasePage(p);