Changeset 17 for abuse/trunk/src/lcache.cppTweet

Timestamp:

Nov 10, 2005, 9:41:13 PM (17 years ago)

Author:

Sam Hocevar

Message:

• absolute shitloads of 64 bit fixes.

File:

• abuse/trunk/src/lcache.cpp (modified) (5 diffs)

abuse/trunk/src/lcache.cpp

@@ -48 +48 @@
 {
   int type=item_type(level);
-  fp->write_byte(type);
+  fp->write_uint8(type);
 
 
@@ -54 +54 @@
   {
     case L_NUMBER :
-    { fp->write_long(lnumber_value(level)); } break;
+    { fp->write_uint32(lnumber_value(level)); } break;
     case L_CHARACTER :
-    { fp->write_short(lcharacter_value(level)); } break;
+    { fp->write_uint16(lcharacter_value(level)); } break;
     case L_STRING :
     { long l=strlen(lstring_value(level))+1;
-      fp->write_long(l);
+      fp->write_uint32(l);
       fp->write(lstring_value(level),l); 
     } break;
     case L_SYMBOL :
-    { fp->write_long((long)level); } break;
+    { fp->write_uint32((long)level); } break;
     case L_CONS_CELL :
     {
-      if (!level) fp->write_long(0);
+      if (!level) fp->write_uint32(0);
       else
       {
@@ -74 +74 @@
         if (b) 
         {
-          fp->write_long(-t);      // negative number means dotted list
+          fp->write_uint32(-t);      // negative number means dotted list
           write_level(fp,b);       // save end of dotted list     
         }
-        else fp->write_long(t);
+        else fp->write_uint32(t);
 
         for (b=level;b && item_type(b)==L_CONS_CELL;b=CDR(b))    
@@ -88 +88 @@
 Cell *load_block(bFILE *fp)
 {
-  int type=fp->read_byte();
+  int type=fp->read_uint8();
   switch (type)
   {   
     case L_NUMBER :
-    { return new_lisp_number(fp->read_long()); } break;
+    { return new_lisp_number(fp->read_uint32()); } break;
     case L_CHARACTER :
-    { return new_lisp_character(fp->read_short()); } break;
+    { return new_lisp_character(fp->read_uint16()); } break;
     case L_STRING :
-    { long l=fp->read_long();
+    { long l=fp->read_uint32();
       lisp_string *s=new_lisp_string(l);
       fp->read(lstring_value(s),l);
@@ -102 +102 @@
     } break;
     case L_SYMBOL :
-    { return (void *)fp->read_long(); } break;
+    { return (void *)fp->read_uint32(); } break;
     case L_CONS_CELL :
     {
-      long t=fp->read_long();
+      long t=fp->read_uint32();
       if (!t) return NULL;
       else