Changeset: 9d4b2fd889df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d4b2fd889df
Modified Files:
gdk/gdk_bat.c
gdk/gdk_heap.c
gdk/gdk_logger.c
gdk/gdk_posix.c
Branch: Jan2014
Log Message:
On Windows, off_t is 32 bits, even on 64 bit architectures.
diffs (50 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -337,7 +337,7 @@ BATattach(int tt, const char *heapfile)
ERRORcheck(st.st_nlink != 1, "BATattach: heapfile must have only one
link\n");
atomsize = ATOMsize(tt);
ERRORcheck(st.st_size % atomsize != 0, "BATattach: heapfile size not
integral number of atoms\n");
- ERRORcheck(st.st_size / atomsize > (off_t) BUN_MAX, "BATattach:
heapfile too large\n");
+ ERRORcheck((size_t) (st.st_size / atomsize) > (size_t) BUN_MAX,
"BATattach: heapfile too large\n");
cap = (BUN) (st.st_size / atomsize);
bs = BATcreatedesc(TYPE_void, tt, 1);
if (bs == NULL)
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -628,7 +628,7 @@ HEAPload_intern(Heap *h, const char *nme
truncsize = GDK_mmap_pagesize; /* minimum of one page */
if (truncsize < h->size &&
(fd = GDKfdlocate(nme, "mrb+", ext)) >= 0) {
- ret = ftruncate(fd, (off_t) truncsize);
+ ret = ftruncate(fd, truncsize);
HEAPDEBUG fprintf(stderr,
"#ftruncate(file=%s.%s, size=" SZFMT
") = %d\n", nme, ext, truncsize, ret);
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -775,8 +775,8 @@ logger_readlog(logger *lg, char *filenam
if (t1 - t0 > 10) {
t0 = t1;
/* not more than once every 10 seconds */
- if (mnstr_fgetpos(lg->log, &fpos) == 0){
- printf("# still reading write-ahead log \"%s\"
(%d%% done)\n", filename, (int) (((off_t) fpos * 100 + 50) / sb.st_size));
+ if (mnstr_fgetpos(lg->log, &fpos) == 0) {
+ printf("# still reading write-ahead log \"%s\"
(%d%% done)\n", filename, (int) ((fpos * 100 + 50) / sb.st_size));
fflush(stdout);
}
}
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -399,7 +399,7 @@ MT_mremap(const char *path, int mode, vo
fprintf(stderr, "= %s:%d:
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): munmap() failed\n", __FILE__, __LINE__,
path?path:"NULL", PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
- if (truncate(path, (off_t) *new_size) < 0)
+ if (truncate(path, *new_size) < 0)
fprintf(stderr, "#MT_mremap(%s): truncate failed\n",
path);
#ifdef MMAP_DEBUG
fprintf(stderr, "MT_mremap(%s,"PTRFMT","SZFMT","SZFMT") ->
shrinking\n", path?path:"NULL", PTRFMTCAST old_address, old_size, *new_size);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
