diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-12-31 17:31:25 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-12-31 17:31:25 +0000 |
commit | ef553264c58d5286b451f5feb89dbd63bac86236 (patch) | |
tree | 95f46218778de710074c2ba03d7ca17358f6f9e3 /src | |
parent | 7b1c5fd65daf683fdc02d59fb14543585fd30e27 (diff) | |
download | gnunet-ef553264c58d5286b451f5feb89dbd63bac86236.tar.gz gnunet-ef553264c58d5286b451f5feb89dbd63bac86236.zip |
-LRN: fixing issues that slipped through earlier
Diffstat (limited to 'src')
-rw-r--r-- | src/include/gnunet_disk_lib.h | 4 | ||||
-rw-r--r-- | src/util/container_bloomfilter.c | 4 | ||||
-rw-r--r-- | src/util/disk.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h index eab3c7bfa..19c1328bd 100644 --- a/src/include/gnunet_disk_lib.h +++ b/src/include/gnunet_disk_lib.h | |||
@@ -301,8 +301,8 @@ GNUNET_DISK_file_test (const char *fil); | |||
301 | * @param whence specification to which position the offset parameter relates to | 301 | * @param whence specification to which position the offset parameter relates to |
302 | * @return the new position on success, GNUNET_SYSERR otherwise | 302 | * @return the new position on success, GNUNET_SYSERR otherwise |
303 | */ | 303 | */ |
304 | uint64_t | 304 | OFF_T |
305 | GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, uint64_t offset, | 305 | GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle *h, OFF_T offset, |
306 | enum GNUNET_DISK_Seek whence); | 306 | enum GNUNET_DISK_Seek whence); |
307 | 307 | ||
308 | 308 | ||
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c index 5016b70ef..84aab6b17 100644 --- a/src/util/container_bloomfilter.c +++ b/src/util/container_bloomfilter.c | |||
@@ -183,7 +183,7 @@ static void | |||
183 | incrementBit (char *bitArray, unsigned int bitIdx, | 183 | incrementBit (char *bitArray, unsigned int bitIdx, |
184 | const struct GNUNET_DISK_FileHandle *fh) | 184 | const struct GNUNET_DISK_FileHandle *fh) |
185 | { | 185 | { |
186 | uint64_t fileSlot; | 186 | OFF_T fileSlot; |
187 | unsigned char value; | 187 | unsigned char value; |
188 | unsigned int high; | 188 | unsigned int high; |
189 | unsigned int low; | 189 | unsigned int low; |
@@ -231,7 +231,7 @@ static void | |||
231 | decrementBit (char *bitArray, unsigned int bitIdx, | 231 | decrementBit (char *bitArray, unsigned int bitIdx, |
232 | const struct GNUNET_DISK_FileHandle *fh) | 232 | const struct GNUNET_DISK_FileHandle *fh) |
233 | { | 233 | { |
234 | uint64_t fileSlot; | 234 | OFF_T fileSlot; |
235 | unsigned char value; | 235 | unsigned char value; |
236 | unsigned int high; | 236 | unsigned int high; |
237 | unsigned int low; | 237 | unsigned int low; |
diff --git a/src/util/disk.c b/src/util/disk.c index 1131ade2d..2cec160b8 100644 --- a/src/util/disk.c +++ b/src/util/disk.c | |||
@@ -244,8 +244,8 @@ GNUNET_DISK_file_handle_size (struct GNUNET_DISK_FileHandle *fh, | |||
244 | * @param whence specification to which position the offset parameter relates to | 244 | * @param whence specification to which position the offset parameter relates to |
245 | * @return the new position on success, GNUNET_SYSERR otherwise | 245 | * @return the new position on success, GNUNET_SYSERR otherwise |
246 | */ | 246 | */ |
247 | uint64_t | 247 | OFF_T |
248 | GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle * h, uint64_t offset, | 248 | GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle * h, OFF_T offset, |
249 | enum GNUNET_DISK_Seek whence) | 249 | enum GNUNET_DISK_Seek whence) |
250 | { | 250 | { |
251 | if (h == NULL) | 251 | if (h == NULL) |
@@ -269,13 +269,13 @@ GNUNET_DISK_file_seek (const struct GNUNET_DISK_FileHandle * h, uint64_t offset, | |||
269 | SetErrnoFromWinError (GetLastError ()); | 269 | SetErrnoFromWinError (GetLastError ()); |
270 | return GNUNET_SYSERR; | 270 | return GNUNET_SYSERR; |
271 | } | 271 | } |
272 | return new_pos.QuadPart; | 272 | return (OFF_T) new_pos.QuadPart; |
273 | #else | 273 | #else |
274 | static int t[] = {[GNUNET_DISK_SEEK_SET] = SEEK_SET, | 274 | static int t[] = {[GNUNET_DISK_SEEK_SET] = SEEK_SET, |
275 | [GNUNET_DISK_SEEK_CUR] = SEEK_CUR,[GNUNET_DISK_SEEK_END] = SEEK_END | 275 | [GNUNET_DISK_SEEK_CUR] = SEEK_CUR,[GNUNET_DISK_SEEK_END] = SEEK_END |
276 | }; | 276 | }; |
277 | 277 | ||
278 | return lseek64 (h->fd, offset, t[whence]); | 278 | return lseek (h->fd, offset, t[whence]); |
279 | #endif | 279 | #endif |
280 | } | 280 | } |
281 | 281 | ||