Changeset: ea7b31fa1fea for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ea7b31fa1fea
Modified Files:
gdk/gdk_heap.c
Branch: default
Log Message:
No need for separate "intern" functions.
diffs (62 lines):
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -774,13 +774,14 @@ HEAPincref(Heap *h)
*
* If we find file X.new, we move it over X (if present) and open it.
*/
-static gdk_return
-HEAPload_intern(Heap *h, const char *nme, const char *ext, const char *suffix,
bool trunc)
+gdk_return
+HEAPload(Heap *h, const char *nme, const char *ext, bool trunc)
{
size_t minsize;
int ret = 0;
char *srcpath, *dstpath;
lng t0;
+ const char suffix[] = ".new";
if (h->storage == STORE_INVALID || h->newstorage == STORE_INVALID) {
size_t allocated;
@@ -889,12 +890,6 @@ HEAPload_intern(Heap *h, const char *nme
return GDK_SUCCEED;
}
-gdk_return
-HEAPload(Heap *h, const char *nme, const char *ext, bool trunc)
-{
- return HEAPload_intern(h, nme, ext, ".new", trunc);
-}
-
/*
* @- HEAPsave
*
@@ -910,12 +905,13 @@ HEAPload(Heap *h, const char *nme, const
* After GDKsave returns successfully (>=0), we assume the heaps are
* safe on stable storage.
*/
-static gdk_return
-HEAPsave_intern(Heap *h, const char *nme, const char *ext, const char *suffix,
bool dosync, BUN free, MT_Lock *lock)
+gdk_return
+HEAPsave(Heap *h, const char *nme, const char *ext, bool dosync, BUN free,
MT_Lock *lock)
{
storage_t store = h->newstorage;
long_str extension;
gdk_return rc;
+ const char suffix[] = ".new";
if (h->base == NULL) {
GDKerror("no heap to save\n");
@@ -965,12 +961,6 @@ HEAPsave_intern(Heap *h, const char *nme
return rc;
}
-gdk_return
-HEAPsave(Heap *h, const char *nme, const char *ext, bool dosync, BUN free,
MT_Lock *lock)
-{
- return HEAPsave_intern(h, nme, ext, ".new", dosync, free, lock);
-}
-
int
HEAPwarm(Heap *h)
{
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
