Changeset: 230bb9ffc302 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=230bb9ffc302
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_imprints.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_private.h
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_fround_impl.h
sql/backends/monet5/sql_round_impl.h
sql/common/sql_hash.c
sql/common/sql_types.c
sql/common/sql_types.h
sql/include/sql_catalog.h
sql/include/sql_hash.h
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_table.c
sql/storage/bat/res_table.c
sql/storage/restrict/restrict_logger.c
sql/storage/restrict/restrict_table.c
sql/storage/sql_catalog.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/storage/store_connections.c
Branch: Oct2014
Log Message:
Added const qualifiers.
diffs (truncated from 2680 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -413,22 +413,22 @@ int lngFromStr(const char *src, int *len
int lngToStr(str *dst, int *len, const lng *src);
const lng lng_nil;
int log_abort(logger *lg);
-int log_bat(logger *lg, BAT *b, char *n);
-int log_bat_clear(logger *lg, char *n);
-int log_bat_persists(logger *lg, BAT *b, char *n);
-int log_bat_transient(logger *lg, char *n);
-int log_delta(logger *lg, BAT *b, char *n);
+int log_bat(logger *lg, BAT *b, const char *n);
+int log_bat_clear(logger *lg, const char *n);
+int log_bat_persists(logger *lg, BAT *b, const char *n);
+int log_bat_transient(logger *lg, const char *n);
+int log_delta(logger *lg, BAT *b, const char *n);
int log_sequence(logger *lg, int seq, lng id);
int log_tend(logger *lg);
int log_tstart(logger *lg);
-log_bid logger_add_bat(logger *lg, BAT *b, char *name);
+log_bid logger_add_bat(logger *lg, BAT *b, const char *name);
lng logger_changes(logger *lg);
int logger_cleanup(logger *lg);
-logger *logger_create(int debug, char *fn, char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp);
+logger *logger_create(int debug, const char *fn, const char *logdir, int
version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp);
void logger_del_bat(logger *lg, log_bid bid);
void logger_destroy(logger *lg);
int logger_exit(logger *lg);
-log_bid logger_find_bat(logger *lg, char *name);
+log_bid logger_find_bat(logger *lg, const char *name);
int logger_restart(logger *lg);
int logger_sequence(logger *lg, int seq, lng *id);
void *mdlopen(const char *library, int mode);
@@ -2788,7 +2788,7 @@ str sortTailRef;
str soundex_impl(str *res, str *Name);
str sqlRef;
int sqlblob_fromstr(char *instr, int *l, blob **val);
-int sqlblob_tostr(str *tostr, int *l, blob *p);
+int sqlblob_tostr(str *tostr, int *l, const blob *p);
int sqlfunctionProp;
str srvpoolRef;
int stableProp;
diff --git a/gdk/gdk_imprints.c b/gdk/gdk_imprints.c
--- a/gdk/gdk_imprints.c
+++ b/gdk/gdk_imprints.c
@@ -805,44 +805,44 @@ BATimprints(BAT *b)
#define getbin(TYPE,B) GETBIN##B(ret, *(TYPE *)v);
int
-IMPSgetbin(int tpe, bte bits, char *inbins, const void *v)
+IMPSgetbin(int tpe, bte bits, const char *inbins, const void *v)
{
int ret = -1;
switch (tpe) {
case TYPE_bte:
{
- bte *bins = (bte *) inbins;
+ const bte *bins = (bte *) inbins;
BINSIZE(bits, getbin, bte);
}
break;
case TYPE_sht:
{
- sht *bins = (sht *) inbins;
+ const sht *bins = (sht *) inbins;
BINSIZE(bits, getbin, sht);
}
break;
case TYPE_int:
{
- int *bins = (int *) inbins;
+ const int *bins = (int *) inbins;
BINSIZE(bits, getbin, int);
}
break;
case TYPE_lng:
{
- lng *bins = (lng *) inbins;
+ const lng *bins = (lng *) inbins;
BINSIZE(bits, getbin, lng);
}
break;
case TYPE_flt:
{
- flt *bins = (flt *) inbins;
+ const flt *bins = (flt *) inbins;
BINSIZE(bits, getbin, flt);
}
break;
case TYPE_dbl:
{
- dbl *bins = (dbl *) inbins;
+ const dbl *bins = (dbl *) inbins;
BINSIZE(bits, getbin, dbl);
}
break;
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -70,7 +70,7 @@
#include "gdk_logger.h"
#include <string.h>
-static BUN BUNfndT(BAT *b, ptr v)
+static BUN BUNfndT(BAT *b, const void *v)
{
return BUNfnd(BATmirror(b), v);
}
@@ -202,7 +202,7 @@ log_read_string(logger *l)
}
static int
-log_write_string(logger *l, char *n)
+log_write_string(logger *l, const char *n)
{
size_t len = strlen(n) + 1; /* log including EOS */
@@ -1089,7 +1089,7 @@ logger_fatal(const char *format, const c
}
static logger *
-logger_new(int debug, char *fn, char *logdir, int version, preversionfix_fptr
prefuncp, postversionfix_fptr postfuncp)
+logger_new(int debug, const char *fn, const char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp)
{
int id = LOG_SID;
logger *lg;
@@ -1469,7 +1469,7 @@ logger_new(int debug, char *fn, char *lo
}
logger *
-logger_create(int debug, char *fn, char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp)
+logger_create(int debug, const char *fn, const char *logdir, int version,
preversionfix_fptr prefuncp, postversionfix_fptr postfuncp)
{
logger *lg = logger_new(debug, fn, logdir, version, prefuncp,
postfuncp);
@@ -1654,7 +1654,7 @@ logger_sequence(logger *lg, int seq, lng
* should simply introduce a versioning scheme.
*/
int
-log_bat_persists(logger *lg, BAT *b, char *name)
+log_bat_persists(logger *lg, BAT *b, const char *name)
{
char *ha, *ta;
int len;
@@ -1736,7 +1736,7 @@ log_bat_persists(logger *lg, BAT *b, cha
}
int
-log_bat_transient(logger *lg, char *name)
+log_bat_transient(logger *lg, const char *name)
{
log_bid bid = logger_find_bat(lg, name);
logformat l;
@@ -1782,7 +1782,7 @@ log_bat_transient(logger *lg, char *name
}
int
-log_delta(logger *lg, BAT *b, char *name)
+log_delta(logger *lg, BAT *b, const char *name)
{
int ok = GDK_SUCCEED;
logformat l;
@@ -1824,7 +1824,7 @@ log_delta(logger *lg, BAT *b, char *name
}
int
-log_bat(logger *lg, BAT *b, char *name)
+log_bat(logger *lg, BAT *b, const char *name)
{
int ok = GDK_SUCCEED;
logformat l;
@@ -1899,7 +1899,7 @@ log_bat(logger *lg, BAT *b, char *name)
}
int
-log_bat_clear(logger *lg, char *name)
+log_bat_clear(logger *lg, const char *name)
{
logformat l;
@@ -2144,7 +2144,7 @@ bm_commit(logger *lg)
}
log_bid
-logger_add_bat(logger *lg, BAT *b, char *name)
+logger_add_bat(logger *lg, BAT *b, const char *name)
{
log_bid bid = logger_find_bat(lg, name);
@@ -2205,7 +2205,7 @@ logger_del_bat(logger *lg, log_bid bid)
}
log_bid
-logger_find_bat(logger *lg, char *name)
+logger_find_bat(logger *lg, const char *name)
{
log_bid res = 0;
BUN p = BUNfndT(lg->catalog_nme, name);
diff --git a/gdk/gdk_logger.h b/gdk/gdk_logger.h
--- a/gdk/gdk_logger.h
+++ b/gdk/gdk_logger.h
@@ -99,7 +99,7 @@ typedef int log_bid;
/* the sequence identifier for frontend objects */
#define OBJ_SID 1
-gdk_export logger *logger_create(int debug, char *fn, char *logdir, int
version, preversionfix_fptr prefuncp, postversionfix_fptr postfuncp);
+gdk_export logger *logger_create(int debug, const char *fn, const char
*logdir, int version, preversionfix_fptr prefuncp, postversionfix_fptr
postfuncp);
gdk_export void logger_destroy(logger *lg);
gdk_export int logger_exit(logger *lg);
gdk_export int logger_restart(logger *lg);
@@ -108,11 +108,11 @@ gdk_export lng logger_changes(logger *lg
gdk_export int logger_sequence(logger *lg, int seq, lng *id);
/* todo pass the transaction id */
-gdk_export int log_bat(logger *lg, BAT *b, char *n);
-gdk_export int log_bat_clear(logger *lg, char *n);
-gdk_export int log_bat_persists(logger *lg, BAT *b, char *n);
-gdk_export int log_bat_transient(logger *lg, char *n);
-gdk_export int log_delta(logger *lg, BAT *b, char *n);
+gdk_export int log_bat(logger *lg, BAT *b, const char *n);
+gdk_export int log_bat_clear(logger *lg, const char *n);
+gdk_export int log_bat_persists(logger *lg, BAT *b, const char *n);
+gdk_export int log_bat_transient(logger *lg, const char *n);
+gdk_export int log_delta(logger *lg, BAT *b, const char *n);
gdk_export int log_tstart(logger *lg); /* TODO return transaction id */
gdk_export int log_tend(logger *lg);
@@ -120,8 +120,8 @@ gdk_export int log_abort(logger *lg);
gdk_export int log_sequence(logger *lg, int seq, lng id);
-gdk_export log_bid logger_add_bat(logger *lg, BAT *b, char *name);
+gdk_export log_bid logger_add_bat(logger *lg, BAT *b, const char *name);
gdk_export void logger_del_bat(logger *lg, log_bid bid);
-gdk_export log_bid logger_find_bat(logger *lg, char *name);
+gdk_export log_bid logger_find_bat(logger *lg, const char *name);
#endif /*_LOGGER_H_*/
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -162,7 +162,7 @@ int HEAPwarm(Heap *h)
__attribute__((__visibility__("hidden")));
void IMPSdestroy(BAT *b)
__attribute__((__visibility__("hidden")));
-int IMPSgetbin(int tpe, bte bits, char *bins, const void *v)
+int IMPSgetbin(int tpe, bte bits, const char *bins, const void *v)
__attribute__((__visibility__("hidden")));
#ifndef NDEBUG
void IMPSprint(BAT *b)
diff --git a/monetdb5/modules/atoms/blob.c b/monetdb5/modules/atoms/blob.c
--- a/monetdb5/modules/atoms/blob.c
+++ b/monetdb5/modules/atoms/blob.c
@@ -230,7 +230,7 @@ blob_tostr(str *tostr, int *l, blob *p)
* no brackets and no spaces in between the hexits
*/
int
-sqlblob_tostr(str *tostr, int *l, blob *p)
+sqlblob_tostr(str *tostr, int *l, const blob *p)
{
char *s;
size_t i;
diff --git a/monetdb5/modules/atoms/blob.h b/monetdb5/modules/atoms/blob.h
--- a/monetdb5/modules/atoms/blob.h
+++ b/monetdb5/modules/atoms/blob.h
@@ -46,7 +46,7 @@ blob_export int TYPE_blob;
blob_export int TYPE_sqlblob;
blob_export var_t blobsize(size_t nitems);
-blob_export int sqlblob_tostr(str *tostr, int *l, blob *p);
+blob_export int sqlblob_tostr(str *tostr, int *l, const blob *p);
blob_export int sqlblob_fromstr(char *instr, int *l, blob **val);
#endif /* __BLOB_H__ */
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1504,7 +1504,7 @@ mvc_get_value(Client cntxt, MalBlkPtr mb
}
str
-mvc_getVersion(lng *version, int *clientid)
+mvc_getVersion(lng *version, const int *clientid)
{
mvc *m = NULL;
Client cntxt = MCgetClient(*clientid);
@@ -1593,7 +1593,7 @@ mvc_bind_dbat(mvc *m, char *sname, char
}
BAT *
-mvc_bind_idxbat(mvc *m, char *sname, char *tname, char *iname, int access)
+mvc_bind_idxbat(mvc *m, const char *sname, const char *tname, const char
*iname, int access)
{
sql_trans *tr = m->session->tr;
BAT *b = NULL;
@@ -1958,25 +1958,25 @@ setwritable(BAT *b)
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
