MonetDB: default - Add some const qualifiers.

[Sjoerd Mullender]

Changeset: fb0bb421bc4d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fb0bb421bc4d
Modified Files:
        gdk/gdk_align.c
        gdk/gdk_batop.c
        gdk/gdk_imprints.c
        gdk/gdk_project.c
        gdk/gdk_storage.c
Branch: default
Log Message:

Add some const qualifiers.


diffs (105 lines):

diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -326,7 +326,7 @@ VIEWreset(BAT *b)
        tvp = VIEWvtparent(b);
        if (tp || tvp) {
                BUN cnt;
-               str nme;
+               const char *nme;
                size_t nmelen;
 
                /* alloc heaps */
@@ -334,7 +334,7 @@ VIEWreset(BAT *b)
 
                cnt = BATcount(b) + 1;
                nme = BBP_physical(b->batCacheid);
-               nmelen = nme ? strlen(nme) : 0;
+               nmelen = strlen(nme);
 
                assert(b->batCacheid > 0);
                assert(tp || tvp || !b->ttype);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -31,7 +31,7 @@ unshare_string_heap(BAT *b)
                h->parentid = b->batCacheid;
                h->farmid = BBPselectfarm(b->batRole, TYPE_str, varheap);
                if (b->tvheap->filename) {
-                       char *nme = BBP_physical(b->batCacheid);
+                       const char *nme = BBP_physical(b->batCacheid);
                        h->filename = GDKfilepath(NOFARM, NULL, nme, "theap");
                        if (h->filename == NULL) {
                                GDKfree(h);
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -206,7 +206,7 @@ BATcheckimprints(BAT *b)
        if (b->timprints == (Imprints *) 1) {
                Imprints *imprints;
                Heap *hp;
-               str nme = BBP_physical(b->batCacheid);
+               const char *nme = BBP_physical(b->batCacheid);
 
                b->timprints = NULL;
                if ((hp = GDKzalloc(sizeof(Heap))) != NULL &&
@@ -316,7 +316,7 @@ BATimprints(BAT *b)
        ALGODEBUG t0 = GDKusec();
        if (b->timprints == NULL) {
                BUN cnt;
-               str nme = BBP_physical(b->batCacheid);
+               const char *nme = BBP_physical(b->batCacheid);
                size_t pages;
                int fd;
 
diff --git a/gdk/gdk_project.c b/gdk/gdk_project.c
--- a/gdk/gdk_project.c
+++ b/gdk/gdk_project.c
@@ -358,7 +358,7 @@ BATproject(BAT *l, BAT *r)
                        bn->tvheap->parentid = bn->batCacheid;
                        bn->tvheap->farmid = BBPselectfarm(bn->batRole, 
TYPE_str, varheap);
                        if (r->tvheap->filename) {
-                               char *nme = BBP_physical(bn->batCacheid);
+                               const char *nme = BBP_physical(bn->batCacheid);
                                bn->tvheap->filename = GDKfilepath(NOFARM, 
NULL, nme, "theap");
                                if (bn->tvheap->filename == NULL)
                                        goto bailout;
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -596,7 +596,7 @@ GDKload(int farmid, const char *nme, con
 static BAT *
 DESCload(int i)
 {
-       str s, nme = BBP_physical(i);
+       const char *s, *nme = BBP_physical(i);
        BAT *b = NULL;
        int tt;
 
@@ -729,7 +729,7 @@ gdk_return
 BATsave(BAT *bd)
 {
        gdk_return err = GDK_SUCCEED;
-       char *nme;
+       const char *nme;
        BAT bs;
        BAT *b = bd;
 
@@ -791,7 +791,7 @@ BATsave(BAT *bd)
 BAT *
 BATload_intern(bat bid, int lock)
 {
-       str nme;
+       const char *nme;
        BAT *b;
 
        assert(bid > 0);
@@ -863,7 +863,7 @@ void
 BATdelete(BAT *b)
 {
        bat bid = b->batCacheid;
-       str o = BBP_physical(bid);
+       const char *o = BBP_physical(bid);
        BAT *loaded = BBP_cache(bid);
 
        assert(bid > 0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list