[prev in list] [next in list] [prev in thread] [next in thread] 

List:       helix-server-cvs
Subject:    [Server-cvs] common/netio fsio.cpp,1.4,1.5 sio.cpp,1.2,1.3
From:       dcollins () helixcommunity ! org
Date:       2010-09-14 18:29:27
Message-ID: 201009141945.o8EJjWBn012068 () mailer ! progressive-comp ! com
[Download RAW message or body]

Update of /cvsroot/server/common/netio
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv18888

Modified Files:
	fsio.cpp sio.cpp 
Log Message:
fix 32-bit Linux build-buster by using HX_OFF_T rather than off_T


Index: fsio.cpp
===================================================================
RCS file: /cvsroot/server/common/netio/fsio.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- fsio.cpp	18 May 2010 17:57:24 -0000	1.4
+++ fsio.cpp	14 Sep 2010 18:29:24 -0000	1.5
@@ -166,7 +166,7 @@
 
     ASSERT(reader.ptr <= reader.end);
     
-    off_t off = read_offset();
+    HX_OFF_T off = read_offset();
 
     Byte* b = reader.ptr;
     reader.ptr += size;
@@ -243,14 +243,14 @@
     return b;
 }
 
-off_t
-FSIO::read_seek(off_t new_off, int whence)
+HX_OFF_T
+FSIO::read_seek(HX_OFF_T new_off, int whence)
 {
     // reset error
     err = 0;
 
     // Compute actual offset
-    off_t offset = read_offset();
+    HX_OFF_T offset = read_offset();
     switch (whence)
     {
 	case SEEK_SET:
@@ -298,7 +298,7 @@
 	// XXX use another field in reg so that we can continue using
 	// already allocated space past where we left off. May be.
 	reader.end = reg->limit;
-	new_off = (off_t)(reg->off + reg->limit - reg->base);
+	new_off = (HX_OFF_T)(reg->off + reg->limit - reg->base);
     }
     else
     {
@@ -320,9 +320,9 @@
 }
 
 Byte*
-FSIO::read_alloc(int& size, off_t new_off, int whence)
+FSIO::read_alloc(int& size, HX_OFF_T new_off, int whence)
 {
-    if (read_seek(new_off, whence) == (off_t)-1)
+    if (read_seek(new_off, whence) == (HX_OFF_T)-1)
 	return 0;
     return SIO::read_alloc(size);
 }
@@ -356,7 +356,7 @@
 
     ASSERT(writer.ptr <= writer.end);
 
-    off_t off = write_offset();
+    HX_OFF_T off = write_offset();
 
     Byte* b = writer.ptr;
     writer.ptr += size;
@@ -399,8 +399,8 @@
     return b;
 }
 
-off_t
-FSIO::write_seek(off_t new_off, int whence)
+HX_OFF_T
+FSIO::write_seek(HX_OFF_T new_off, int whence)
 {
     /*
      * Before calling write_seek, the program must ensure that all
@@ -415,7 +415,7 @@
     }
 
     // Compute actual offset
-    off_t offset = writer.creg->off;
+    HX_OFF_T offset = writer.creg->off;
 
     switch (whence)
     {
@@ -449,7 +449,7 @@
 }
 
 Byte*
-FSIO::write_alloc(int& size, off_t seek, int whence)
+FSIO::write_alloc(int& size, HX_OFF_T seek, int whence)
 {
     // XXX this code's been dead since 1996 so it was removed
     // XXX incomplete
@@ -474,7 +474,7 @@
     {
 	if (reg == writer.creg)
 	{
-	    off_t off = write_offset();
+	    HX_OFF_T off = write_offset();
 
 	    writer.creg->limit = writer.end;
 	    writer.creg = new Region(writer.creg);
@@ -606,7 +606,7 @@
 	return len;
 }
 
-off_t
+HX_OFF_T
 FSIO::file_size()
 {
     return io->file_size();

Index: sio.cpp
===================================================================
RCS file: /cvsroot/server/common/netio/sio.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sio.cpp	23 Jan 2003 23:42:50 -0000	1.2
+++ sio.cpp	14 Sep 2010 18:29:24 -0000	1.3
@@ -72,7 +72,7 @@
 }
 
 SIO::Region*
-SIO::Region_list::find(off_t offt, SIO::Region**& regp)
+SIO::Region_list::find(HX_OFF_T offt, SIO::Region**& regp)
 {
     Region* r;
     Region **rp;


_______________________________________________
Server-cvs mailing list
Server-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/server-cvs
[prev in list] [next in list] [prev in thread] [next in thread]