Changeset: f7442c7b745e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f7442c7b745e
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_atoms.mx
MonetDB/src/gdk/gdk_bat.mx
MonetDB/src/gdk/gdk_bbp.mx
MonetDB/src/gdk/gdk_heap.mx
MonetDB/src/gdk/gdk_storage.mx
MonetDB/src/gdk/gdk_utils.mx
Branch: default
Log Message:
Use const char * instead of str (or char *) where it makes sense.
There are likely (many) more places where it makes sense, but this is
a start.
It is useful to use const char * because it tells the user of the
interface that the value is not going to be changed (and it may help
the compiler too).
diffs (truncated from 488 to 300 lines):
diff -r 70fab7f1e1f1 -r f7442c7b745e MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mx Thu Jan 13 15:41:02 2011 +0100
+++ b/MonetDB/src/gdk/gdk.mx Thu Jan 13 17:54:05 2011 +0100
@@ -1080,13 +1080,13 @@
gdk_export int HEAPalloc(Heap *h, size_t nitems, size_t itemsize);
gdk_export int HEAPfree(Heap *h);
gdk_export int HEAPextend(Heap *h, size_t size);
-gdk_export int HEAPload(Heap *h, str nme, str ext, int trunc);
-gdk_export int HEAPsave(Heap *h, str nme, str ext);
+gdk_export int HEAPload(Heap *h, const char *nme, const char *ext, int trunc);
+gdk_export int HEAPsave(Heap *h, const char *nme, const char *ext);
gdk_export int HEAPshare(Heap *dst, Heap *src, int copy_on_write);
gdk_export int HEAPcopy(Heap *dst, Heap *src);
gdk_export int HEAPwarm(Heap *h);
gdk_export size_t HEAPsubcopy(Heap *dst, Heap *src, size_t size, size_t
offset);
-gdk_export int HEAPdelete(Heap *h, str o, str ext);
+gdk_export int HEAPdelete(Heap *h, const char *o, const char *ext);
gdk_export size_t HEAPvmsize(Heap *h);
gdk_export size_t HEAPmemsize(Heap *h);
@@ -1708,7 +1708,7 @@
@{
@h
*/
-gdk_export str BATrename(BAT *b, str nme);
+gdk_export str BATrename(BAT *b, const char *nme);
#ifndef BATcount
gdk_export BUN BATcount(BAT *b);
#endif
@@ -1721,9 +1721,9 @@
gdk_export BAT *BATkey(BAT *b, int onoff);
gdk_export BAT *BATset(BAT *b, int onoff);
gdk_export BAT *BATmode(BAT *b, int onoff);
-gdk_export BAT *BATroles(BAT *b, str hnme, str tnme);
-gdk_export BAT *BATcol_name(BAT *b, str tnme);
-gdk_export int BATname(BAT *b, str nme);
+gdk_export BAT *BATroles(BAT *b, const char *hnme, const char *tnme);
+gdk_export BAT *BATcol_name(BAT *b, const char *tnme);
+gdk_export int BATname(BAT *b, const char *nme);
gdk_export BAT *BATseqbase(BAT *b, oid o);
gdk_export BAT *BATsetaccess(BAT *b, int mode);
gdk_export int BATgetaccess(BAT *b);
@@ -1861,7 +1861,7 @@
#define USE_THASH 8 /* hash index */
#define USE_ALL (USE_HEAD|USE_TAIL|USE_HHASH|USE_THASH)
-gdk_export BAT *BATload(str nme);
+gdk_export BAT *BATload(const char *nme);
gdk_export BAT *BATload_intern(bat bid, int lock);
#define BATaccessBegin(b,what,advice) BATaccess(b,what,advice,1)
#define BATaccessEnd(b,what,advice) BATaccess(b,what,advice,-1)
@@ -1873,16 +1873,16 @@
gdk_export size_t BATvmsize(BAT *b, int dirty);
gdk_export size_t BATmemsize(BAT *b, int dirty);
-gdk_export int GDKfdlocate(str nme, str mode, str ext);
-gdk_export FILE *GDKfilelocate(str nme, str mode, str ext);
-gdk_export void GDKfilepath(str path, str nme, str mode, str ext);
-gdk_export int GDKcreatedir(str nme);
-gdk_export int GDKremovedir(str nme);
-
-gdk_export char *GDKload(str nme, str ext, size_t size, size_t chunk, int
mode);
-gdk_export int GDKsave(str nme, str ext, void *buf, size_t size, int mode);
-gdk_export int GDKunlink(str dir, str nme, str extension);
-gdk_export int GDKmove(str dir1, str nme1, str ext1, str dir2, str nme2, str
ext2);
+gdk_export int GDKfdlocate(const char *nme, const char *mode, const char *ext);
+gdk_export FILE *GDKfilelocate(const char *nme, const char *mode, const char
*ext);
+gdk_export void GDKfilepath(str path, const char *nme, const char *mode, const
char *ext);
+gdk_export int GDKcreatedir(const char *nme);
+gdk_export int GDKremovedir(const char *nme);
+
+gdk_export char *GDKload(const char *nme, const char *ext, size_t size, size_t
chunk, int mode);
+gdk_export int GDKsave(const char *nme, const char *ext, void *buf, size_t
size, int mode);
+gdk_export int GDKunlink(const char *dir, const char *nme, const char
*extension);
+gdk_export int GDKmove(const char *dir1, const char *nme1, const char *ext1,
const char *dir2, const char *nme2, const char *ext2);
/*
@
@}
@@ -2139,12 +2139,12 @@
#define BBPRENAME_ILLEGAL (-2)
#define BBPRENAME_LONG (-3)
-gdk_export void BBPlock(str s);
+gdk_export void BBPlock(const char *s);
gdk_export void BBPhot(bat b);
gdk_export void BBPcold(bat b);
gdk_export void BBPtrim(size_t memdelta, size_t vmdelta);
-gdk_export void BBPunlock(str s);
+gdk_export void BBPunlock(const char *s);
gdk_export str BBPlogical(bat b, str buf);
gdk_export str BBPphysical(bat b, str buf);
@@ -2778,7 +2778,7 @@
gdk_export Thread THRnew(MT_Id pid, str name);
gdk_export void THRdel(Thread t);
gdk_export int THRinit(void);
-gdk_export int THRexit(str nme);
+gdk_export int THRexit(const char *nme);
gdk_export int THRcnt(void);
gdk_export void THRsetdata(int, ptr);
gdk_export void *THRgetdata(int);
diff -r 70fab7f1e1f1 -r f7442c7b745e MonetDB/src/gdk/gdk_atoms.mx
--- a/MonetDB/src/gdk/gdk_atoms.mx Thu Jan 13 15:41:02 2011 +0100
+++ b/MonetDB/src/gdk/gdk_atoms.mx Thu Jan 13 17:54:05 2011 +0100
@@ -170,16 +170,16 @@
gdk_export int strToStr(str *dst, int *len, str src);
gdk_export str strRead(str a, stream *s, size_t cnt);
gdk_export int strWrite(str a, stream *s, size_t cnt);
-gdk_export BUN strHash(str s);
+gdk_export BUN strHash(const char *s);
gdk_export void strCleanHash(Heap *hp, int rebuild);
-gdk_export var_t strPut(Heap *b, var_t *off, str src);
+gdk_export var_t strPut(Heap *b, var_t *off, const char *src);
gdk_export void strHeap(Heap *d, size_t cap);
gdk_export int strLen(const char *s);
-gdk_export int strCmp(str l, str r);
-gdk_export int strNil(str s);
+gdk_export int strCmp(const char *l, const char *r);
+gdk_export int strNil(const char *s);
gdk_export int strElimDoubles(Heap *h);
-gdk_export var_t strLocate(Heap *h, str v);
-gdk_export int strCmpNoNil(unsigned char *l, unsigned char *r);
+gdk_export var_t strLocate(Heap *h, const char *v);
+gdk_export int strCmpNoNil(const unsigned char *l, const unsigned char *r);
gdk_export int escapedStrlen(const char *src);
gdk_export int escapedStr(char *dst, const char *src, int dstlen);
@@ -1826,12 +1826,12 @@
#define GDK_STRNIL(s) ((s) == NULL || *(chr*) (s) == GDK_chr_min)
#define GDK_STRLEN(s) ((GDK_STRNIL(s)?1:strlen(s))+1)
#define GDK_STRCMP(l,r) (GDK_STRNIL(l)?(GDK_STRNIL(r)?0:-1):GDK_STRNIL(r)?1: \
- (*(unsigned char*)(l) < *(unsigned char*)(r))?-1: \
- (*(unsigned char*)(l) > *(unsigned char*)(r))?1: \
- strCmpNoNil((unsigned char*)(l),(unsigned char*)(r)))
+ (*(const unsigned char*)(l) < *(const unsigned
char*)(r))?-1: \
+ (*(const unsigned char*)(l) > *(const unsigned
char*)(r))?1: \
+ strCmpNoNil((const unsigned char*)(l),(const
unsigned char*)(r)))
@c
int
-strNil(str s)
+strNil(const char *s)
{
return GDK_STRNIL(s);
}
@@ -1843,13 +1843,13 @@
}
int
-strCmp(str l, str r)
+strCmp(const char *l, const char *r)
{
return GDK_STRCMP(l, r);
}
int
-strCmpNoNil(unsigned char *l, unsigned char *r)
+strCmpNoNil(const unsigned char *l, const unsigned char *r)
{
while (*l == *r) {
if (*l == 0)
@@ -1886,7 +1886,7 @@
@h
#define GDK_STRHASH(x,y) \
do { \
- str _key = (str) (x); \
+ const char *_key = (const char *) (x); \
BUN _i; \
for (_i = y = 0; _key[_i]; _i++) { \
y += _key[_i]; \
@@ -1900,7 +1900,7 @@
@c
BUN
-strHash(str s)
+strHash(const char *s)
{
BUN res;
@@ -1928,7 +1928,7 @@
#define EXTRALEN ((SIZEOF_BUN + GDK_VARALIGN - 1) & ~(GDK_VARALIGN - 1))
var_t
-strLocate(Heap *h, str v)
+strLocate(Heap *h, const char *v)
{
stridx_t *ref, *next;
size_t extralen = h->hashash ? EXTRALEN : 0;
@@ -1951,7 +1951,7 @@
}
var_t
-strPut(Heap *h, var_t *dst, str v)
+strPut(Heap *h, var_t *dst, const char *v)
{
size_t elimbase = GDK_ELIMBASE(h->free);
size_t pad = GDK_VARALIGN - (h->free & (GDK_VARALIGN - 1));
diff -r 70fab7f1e1f1 -r f7442c7b745e MonetDB/src/gdk/gdk_bat.mx
--- a/MonetDB/src/gdk/gdk_bat.mx Thu Jan 13 15:41:02 2011 +0100
+++ b/MonetDB/src/gdk/gdk_bat.mx Thu Jan 13 17:54:05 2011 +0100
@@ -2401,14 +2401,14 @@
@{
@c
int
-BATname(BAT *b, str nme)
+BATname(BAT *b, const char *nme)
{
BATcheck(b, "BATname");
return BBPrename(b->batCacheid, nme);
}
str
-BATrename(BAT *b, str nme)
+BATrename(BAT *b, const char *nme)
{
int ret;
@@ -2430,7 +2430,7 @@
BAT *
-BATroles(BAT *b, str hnme, str tnme)
+BATroles(BAT *b, const char *hnme, const char *tnme)
{
BATcheck(b, "BATroles");
if (b->hident && !default_ident(b->hident))
@@ -2449,7 +2449,7 @@
}
BAT *
-BATcol_name(BAT *b, str tnme)
+BATcol_name(BAT *b, const char *tnme)
{
BATcheck(b, "BATcol_name");
if (b->tident && !default_ident(b->tident))
diff -r 70fab7f1e1f1 -r f7442c7b745e MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mx Thu Jan 13 15:41:02 2011 +0100
+++ b/MonetDB/src/gdk/gdk_bbp.mx Thu Jan 13 17:54:05 2011 +0100
@@ -122,12 +122,12 @@
gdk_export void BBPuncacheit(bat bid);
gdk_export int BBPreclaim(BAT *b);
gdk_export int BBPsave(BAT *b);
-gdk_export int BBPrename(bat bid, str nme);
+gdk_export int BBPrename(bat bid, const char *nme);
gdk_export BATstore *BBPrecycle(int ht, int tt, size_t cap);
gdk_export wrd BBPrecycle_minsize(wrd);
/* query interface */
-gdk_export bat BBPindex(str nme);
+gdk_export bat BBPindex(const char *nme);
gdk_export BAT *BBPdescriptor(bat b);
/* swapping interface */
@@ -335,7 +335,7 @@
static int BBPunloadCnt = 0;
void
-BBPlock(str nme)
+BBPlock(const char *nme)
{
int i;
@@ -357,7 +357,7 @@
}
void
-BBPunlock(str nme)
+BBPunlock(const char *nme)
{
int i;
@@ -1573,7 +1573,7 @@
*/
@c
static INLINE bat
-BBP_find(str nme, int lock)
+BBP_find(const char *nme, int lock)
{
bat i = BBPnamecheck(nme);
@@ -1599,7 +1599,7 @@
}
bat
-BBPindex(str nme)
+BBPindex(const char *nme)
{
return BBP_find(nme, TRUE);
}
@@ -1938,7 +1938,7 @@
*/
@c
int
-BBPrename(bat bid, str nme)
+BBPrename(bat bid, const char *nme)
{
BAT *b = BBPdescriptor(bid);
long_str dirname;
@@ -3631,12 +3631,10 @@
*/
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
