[GNUnet-SVN] r18865 - in gnunet/src: include util

[gnunet]

Author: grothoff
Date: 2011-12-31 18:31:25 +0100 (Sat, 31 Dec 2011)
New Revision: 18865

Modified:
   gnunet/src/include/gnunet_disk_lib.h
   gnunet/src/util/container_bloomfilter.c
   gnunet/src/util/disk.c
Log:
-LRN: fixing issues that slipped through earlier

Modified: gnunet/src/include/gnunet_disk_lib.h
===================================================================
--- gnunet/src/include/gnunet_disk_lib.h        2011-12-31 10:24:22 UTC (rev 
18864)
+++ gnunet/src/include/gnunet_disk_lib.h        2011-12-31 17:31:25 UTC (rev 
18865)
@@ -301,8 +301,8 @@
  * @param whence specification to which position the offset parameter relates 
to
  * @return the new position on success, GNUNET_SYSERR otherwise
  */
-uint64_t
-GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, uint64_t offset,
+OFF_T
+GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, OFF_T offset,
                        enum GNUNET_DISK_Seek whence);
 
 

Modified: gnunet/src/util/container_bloomfilter.c
===================================================================
--- gnunet/src/util/container_bloomfilter.c     2011-12-31 10:24:22 UTC (rev 
18864)
+++ gnunet/src/util/container_bloomfilter.c     2011-12-31 17:31:25 UTC (rev 
18865)
@@ -183,7 +183,7 @@
 incrementBit (char *bitArray, unsigned int bitIdx,
               const struct GNUNET_DISK_FileHandle *fh)
 {
-  uint64_t fileSlot;
+  OFF_T fileSlot;
   unsigned char value;
   unsigned int high;
   unsigned int low;
@@ -231,7 +231,7 @@
 decrementBit (char *bitArray, unsigned int bitIdx,
               const struct GNUNET_DISK_FileHandle *fh)
 {
-  uint64_t fileSlot;
+  OFF_T fileSlot;
   unsigned char value;
   unsigned int high;
   unsigned int low;

Modified: gnunet/src/util/disk.c
===================================================================
--- gnunet/src/util/disk.c      2011-12-31 10:24:22 UTC (rev 18864)
+++ gnunet/src/util/disk.c      2011-12-31 17:31:25 UTC (rev 18865)
@@ -244,8 +244,8 @@
  * @param whence specification to which position the offset parameter relates 
to
  * @return the new position on success, GNUNET_SYSERR otherwise
  */
-uint64_t
-GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle * h, uint64_t 
offset,
+OFF_T
+GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle * h, OFF_T offset,
                        enum GNUNET_DISK_Seek whence)
 {
   if (h == NULL)
@@ -269,13 +269,13 @@
     SetErrnoFromWinError (GetLastError ());
     return GNUNET_SYSERR;
   }
-  return new_pos.QuadPart;
+  return (OFF_T) new_pos.QuadPart;
 #else
   static int t[] = {[GNUNET_DISK_SEEK_SET] = SEEK_SET,
     [GNUNET_DISK_SEEK_CUR] = SEEK_CUR,[GNUNET_DISK_SEEK_END] = SEEK_END
   };
 
-  return lseek64 (h->fd, offset, t[whence]);
+  return lseek (h->fd, offset, t[whence]);
 #endif
 }