Changeset: 51bd2fc5f834 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=51bd2fc5f834
Modified Files:
clients/Tests/exports.stable.out
geom/monetdb5/geom.c
monetdb5/extras/rdf/rdf.h
monetdb5/extras/rdf/rdfalgebra.c
monetdb5/extras/sphinx/sphinx.c
monetdb5/extras/sphinx/sphinx.h
monetdb5/modules/atoms/batxml.c
sql/backends/monet5/sql_cast.h
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_cast_impl_down_from_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_cast_impl_up_to_int.h
Branch: Oct2014
Log Message:
Add some const keywords.
diffs (truncated from 574 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
@@ -687,8 +687,8 @@ str AGGRsubvariance_dbl(bat *retval, bat
str AGGRsubvariancecand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat
*sid, bit *skip_nils, bit *abort_on_error);
str AGGRsubvariancep_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bit
*skip_nils, bit *abort_on_error);
str AGGRsubvariancepcand_dbl(bat *retval, bat *bid, bat *gid, bat *eid, bat
*sid, bit *skip_nils, bit *abort_on_error);
-str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils);
-str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils);
+str AGGRsubxml(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bit *skip_nils);
+str AGGRsubxmlcand(bat *retval, const bat *bid, const bat *gid, const bat
*eid, const bat *sid, const bit *skip_nils);
str AGGRsum2_bte(bat *retval, bat *bid, bat *eid);
str AGGRsum2_dbl(bat *retval, bat *bid, bat *eid);
str AGGRsum2_flt(bat *retval, bat *bid, bat *eid);
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -50,19 +50,19 @@ geom_export wkb *wkbNULL(void);
geom_export str geom_prelude(void *ret);
geom_export str geom_epilogue(void *ret);
geom_export mbr *mbrNULL(void);
-geom_export int mbrFROMSTR(char *src, int *len, mbr **atom);
+geom_export int mbrFROMSTR(const char *src, int *len, mbr **atom);
geom_export int mbrTOSTR(char **dst, int *len, mbr *atom);
geom_export BUN mbrHASH(mbr *atom);
geom_export int mbrCOMP(mbr *l, mbr *r);
geom_export mbr *mbrREAD(mbr *a, stream *s, size_t cnt);
geom_export int mbrWRITE(mbr *c, stream *s, size_t cnt);
-geom_export str mbrFromString(mbr **w, str *src);
+geom_export str mbrFromString(mbr **w, const str *src);
geom_export str mbrFromMBR(mbr **w, mbr **src);
geom_export int wkbTOSTR(char **dst, int *len, wkb *atom);
-geom_export int wkbFROMSTR(char *src, int *len, wkb **atom);
-geom_export str wkbFromString(wkb **w, str *wkt);
+geom_export int wkbFROMSTR(const char *src, int *len, wkb **atom);
+geom_export str wkbFromString(wkb **w, const str *wkt);
geom_export str wkbFromWKB(wkb **w, wkb **src);
-geom_export str wkbFromText(wkb **w, str *wkt, int *tpe);
+geom_export str wkbFromText(wkb **w, const str *wkt, const int *tpe);
geom_export BUN wkbHASH(wkb *w);
geom_export int wkbCOMP(wkb *l, wkb *r);
geom_export wkb *wkbNULL(void);
@@ -74,13 +74,13 @@ geom_export int wkbWRITE(wkb *a, stream
geom_export int wkbLENGTH(wkb *p);
geom_export void wkbHEAP(Heap *heap, size_t capacity);
geom_export var_t wkbPUT(Heap *h, var_t *bun, wkb *val);
-geom_export str ordinatesMBR(mbr **res, flt *minX, flt *minY, flt *maxX, flt
*maxY);
+geom_export str ordinatesMBR(mbr **res, const flt *minX, const flt *minY,
const flt *maxX, const flt *maxY);
geom_export str wkbMBR(mbr **res, wkb **geom);
geom_export wkb *geos2wkb(GEOSGeom geosGeometry);
geom_export str wkbgetcoordX(dbl *out, wkb **geom);
geom_export str wkbgetcoordY(dbl *out, wkb **geom);
-geom_export str wkbcreatepoint(wkb **out, dbl *x, dbl *y);
-geom_export str wkbcreatepoint_bat(bat *out, bat *x, bat *y);
+geom_export str wkbcreatepoint(wkb **out, const dbl *x, const dbl *y);
+geom_export str wkbcreatepoint_bat(bat *out, const bat *x, const bat *y);
geom_export str mbroverlaps(bit *out, mbr **b1, mbr **b2);
geom_export str wkbDimension(int *out, wkb **geom);
geom_export str wkbGeometryTypeId(int *out, wkb **geom);
@@ -98,7 +98,7 @@ geom_export str wkbCrosses(bit *out, wkb
geom_export str wkbWithin(bit *out, wkb **a, wkb **b);
geom_export str wkbContains(bit *out, wkb **a, wkb **b);
geom_export str wkbOverlaps(bit *out, wkb **a, wkb **b);
-geom_export str wkbRelate(bit *out, wkb **a, wkb **b, str *pattern);
+geom_export str wkbRelate(bit *out, wkb **a, wkb **b, const str *pattern);
geom_export str wkbArea(dbl *out, wkb **a);
geom_export str wkbLength(dbl *out, wkb **a);
geom_export str wkbDistance(dbl *out, wkb **a, wkb **b);
@@ -106,7 +106,7 @@ geom_export str wkbIntersection(wkb **ou
geom_export str wkbUnion(wkb **out, wkb **a, wkb **b);
geom_export str wkbDifference(wkb **out, wkb **a, wkb **b);
geom_export str wkbSymDifference(wkb **out, wkb **a, wkb **b);
-geom_export str wkbBuffer(wkb **out, wkb **geom, dbl *distance);
+geom_export str wkbBuffer(wkb **out, wkb **geom, const dbl *distance);
str
geom_prelude(void *ret)
@@ -155,7 +155,7 @@ mbrNULL(void)
/* return number of parsed characters. */
int
-mbrFROMSTR(char *src, int *len, mbr **atom)
+mbrFROMSTR(const char *src, int *len, mbr **atom)
{
int nil = 0;
int nchars = 0; /* The number of characters parsed; the return value. */
@@ -312,7 +312,7 @@ mbrWRITE(mbr *c, stream *s, size_t cnt)
}
str
-mbrFromString(mbr **w, str *src)
+mbrFromString(mbr **w, const str *src)
{
int len = *w ? (int) sizeof(mbr) : 0;
char *errbuf;
@@ -397,7 +397,7 @@ wkbTOSTR(char **dst, int *len, wkb *atom
/* return number of parsed characters. */
int
-wkbFROMSTR(char *src, int *len, wkb **atom)
+wkbFROMSTR(const char *src, int *len, wkb **atom)
{
GEOSGeom geosGeometry = NULL; /* The geometry object that is parsed
from the src string. */
unsigned char *wkbSer = NULL; /* The "well known binary"
serialization of the geometry object. */
@@ -447,7 +447,7 @@ wkbFROMSTR(char *src, int *len, wkb **at
}
str
-wkbFromString(wkb **w, str *wkt)
+wkbFromString(wkb **w, const str *wkt)
{
int len = 0;
char *errbuf;
@@ -486,7 +486,7 @@ wkbFromWKB(wkb **w, wkb **src)
}
str
-wkbFromText(wkb **w, str *wkt, int *tpe)
+wkbFromText(wkb **w, const str *wkt, const int *tpe)
{
int len = 0, te = *tpe;
char *errbuf;
@@ -643,7 +643,7 @@ wkbPUT(Heap *h, var_t *bun, wkb *val)
*/
str
-ordinatesMBR(mbr **res, flt *minX, flt *minY, flt *maxX, flt *maxY)
+ordinatesMBR(mbr **res, const flt *minX, const flt *minY, const flt *maxX,
const flt *maxY)
{
if ((*res = (mbr *) GDKmalloc(sizeof(mbr))) == NULL)
throw(MAL, "geom.mbr", MAL_MALLOC_FAIL);
@@ -752,7 +752,7 @@ wkbgetcoordY(dbl *out, wkb **geom)
}
str
-wkbcreatepoint(wkb **out, dbl *x, dbl *y)
+wkbcreatepoint(wkb **out, const dbl *x, const dbl *y)
{
GEOSCoordSeq pnt;
if (*x == dbl_nil || *y == dbl_nil) {
@@ -771,7 +771,7 @@ wkbcreatepoint(wkb **out, dbl *x, dbl *y
}
str
-wkbcreatepoint_bat(bat *out, bat *ix, bat *iy)
+wkbcreatepoint_bat(bat *out, const bat *ix, const bat *iy)
{
BAT *bo = NULL, *bx = NULL, *by = NULL;
dbl *x = NULL, *y = NULL;
@@ -1054,7 +1054,7 @@ wkbOverlaps(bit *out, wkb **a, wkb **b)
}
str
-wkbRelate(bit *out, wkb **a, wkb **b, str *pattern)
+wkbRelate(bit *out, wkb **a, wkb **b, const str *pattern)
{
GEOSGeom ga = wkb2geos(*a);
GEOSGeom gb = wkb2geos(*b);
@@ -1215,7 +1215,7 @@ wkbSymDifference(wkb **out, wkb **a, wkb
}
str
-wkbBuffer(wkb **out, wkb **geom, dbl *distance)
+wkbBuffer(wkb **out, wkb **geom, const dbl *distance)
{
GEOSGeom geosGeometry = wkb2geos(*geom);
diff --git a/monetdb5/extras/rdf/rdf.h b/monetdb5/extras/rdf/rdf.h
--- a/monetdb5/extras/rdf/rdf.h
+++ b/monetdb5/extras/rdf/rdf.h
@@ -48,10 +48,10 @@ RDFParser(BAT **graph, str *location, st
rdf_export str
RDFleftfetchjoin_sortedestimate(int *result, int *lid, int *rid, lng
*estimate);
rdf_export str
-RDFleftfetchjoin_sorted(bat *result, bat* lid, bat *rid);
+RDFleftfetchjoin_sorted(bat *result, const bat* lid, const bat *rid);
rdf_export str
-TKNZRrdf2str (bat *res, bat *bid, bat *map);
+TKNZRrdf2str (bat *res, const bat *bid, const bat *map);
#define RDF_MIN_LITERAL (((oid) 1) << ((sizeof(oid)==8)?62:30))
diff --git a/monetdb5/extras/rdf/rdfalgebra.c b/monetdb5/extras/rdf/rdfalgebra.c
--- a/monetdb5/extras/rdf/rdfalgebra.c
+++ b/monetdb5/extras/rdf/rdfalgebra.c
@@ -26,7 +26,7 @@
#include "tokenizer.h"
str
-RDFleftfetchjoin_sorted(bat *result, bat *lid, bat *rid)
+RDFleftfetchjoin_sorted(bat *result, const bat *lid, const bat *rid)
{
BAT *left, *right, *bn = NULL;
@@ -54,7 +54,7 @@ RDFleftfetchjoin_sorted(bat *result, bat
str
-TKNZRrdf2str(bat *res, bat *bid, bat *map)
+TKNZRrdf2str(bat *res, const bat *bid, const bat *map)
{
BAT *r, *b, *m;
BATiter bi, mi;
diff --git a/monetdb5/extras/sphinx/sphinx.c b/monetdb5/extras/sphinx/sphinx.c
--- a/monetdb5/extras/sphinx/sphinx.c
+++ b/monetdb5/extras/sphinx/sphinx.c
@@ -80,7 +80,7 @@ sphinx_searchIndexLimit(BAT **ret, /* pu
}
str
-SPHINXsearchIndexLimit(bat *ret, str *query, str *index, int *limit)
+SPHINXsearchIndexLimit(bat *ret, const str *query, const str *index, const int
*limit)
{
BAT *b = NULL;
str msg = sphinx_searchIndexLimit(&b, *query, *index, *limit);
diff --git a/monetdb5/extras/sphinx/sphinx.h b/monetdb5/extras/sphinx/sphinx.h
--- a/monetdb5/extras/sphinx/sphinx.h
+++ b/monetdb5/extras/sphinx/sphinx.h
@@ -36,7 +36,7 @@
#define sphinx_export extern
#endif
-sphinx_export str SPHINXsearchIndexLimit(bat *ret, str *query, str *index, int
*limit);
+sphinx_export str SPHINXsearchIndexLimit(bat *ret, const str *query, const str
*index, const int *limit);
#endif /* SPHINX_H */
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -73,8 +73,8 @@ batxml_export str BATXMLforest(Client cn
batxml_export str BATXMLagg(bat *ret, const bat *bid, const bat *grp);
batxml_export str BATXMLagg3(bat *ret, const bat *bid, const bat *grp, const
bat *e);
batxml_export str BATXMLgroup(xml *ret, const bat *bid);
-batxml_export str AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid,
bat *sid, bit *skip_nils);
-batxml_export str AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, bit
*skip_nils);
+batxml_export str AGGRsubxmlcand(bat *retval, const bat *bid, const bat *gid,
const bat *eid, const bat *sid, const bit *skip_nils);
+batxml_export str AGGRsubxml(bat *retval, const bat *bid, const bat *gid,
const bat *eid, const bit *skip_nils);
#define prepareResult(X,Y,tpe,Z,free) \
@@ -1662,7 +1662,7 @@ BATxmlaggr(BAT **bnp, BAT *b, BAT *g, BA
}
str
-AGGRsubxmlcand(bat *retval, bat *bid, bat *gid, bat *eid, bat *sid, bit
*skip_nils)
+AGGRsubxmlcand(bat *retval, const bat *bid, const bat *gid, const bat *eid,
const bat *sid, const bit *skip_nils)
{
BAT *b, *g, *e, *s, *bn = NULL;
const char *err;
@@ -1709,7 +1709,7 @@ AGGRsubxmlcand(bat *retval, bat *bid, ba
}
str
-AGGRsubxml(bat *retval, bat *bid, bat *gid, bat *eid, bit *skip_nils)
+AGGRsubxml(bat *retval, const bat *bid, const bat *gid, const bat *eid, const
bit *skip_nils)
{
return AGGRsubxmlcand(retval, bid, gid, eid, NULL, skip_nils);
}
diff --git a/sql/backends/monet5/sql_cast.h b/sql/backends/monet5/sql_cast.h
--- a/sql/backends/monet5/sql_cast.h
+++ b/sql/backends/monet5/sql_cast.h
@@ -21,15 +21,15 @@
* This file was generated by using the script sql_cast.sh.
*/
-#define CAST_INTEGER_2_NUMERIC_2(T1,T2)
\
-sql5_export str T1##_2_##T2(T2 *res, T1 *v);
\
-sql5_export str bat##T1##_2_##T2(bat *res, bat *v);
\
-sql5_export str T1##_dec2_##T2(T2 *res, int *s1, T1 *v);
\
-sql5_export str bat##T1##_dec2_##T2(bat *res, int *s1, bat *v);
\
-sql5_export str T1##_dec2dec_##T2(T2 *res, int *S1, T1 *v, int *d2, int *S2);
\
-sql5_export str bat##T1##_dec2dec_##T2(bat *res, int *S1, bat *v, int *d2, int
*S2);\
-sql5_export str T1##_num2dec_##T2(T2 *res, T1 *v, int *d2, int *s2);
\
-sql5_export str bat##T1##_num2dec_##T2(bat *res, bat *v, int *d2, int *s2)
+#define CAST_INTEGER_2_NUMERIC_2(T1,T2)
\
+sql5_export str T1##_2_##T2(T2 *res, const T1 *v); \
+sql5_export str bat##T1##_2_##T2(bat *res, const bat *v); \
+sql5_export str T1##_dec2_##T2(T2 *res, const int *s1, const T1 *v); \
+sql5_export str bat##T1##_dec2_##T2(bat *res, const int *s1, const bat *v); \
+sql5_export str T1##_dec2dec_##T2(T2 *res, const int *S1, const T1 *v, const
int *d2, const int *S2); \
+sql5_export str bat##T1##_dec2dec_##T2(bat *res, const int *S1, const bat *v,
const int *d2, const int *S2); \
+sql5_export str T1##_num2dec_##T2(T2 *res, const T1 *v, const int *d2, const
int *s2); \
+sql5_export str bat##T1##_num2dec_##T2(bat *res, const bat *v, const int *d2,
const int *s2)
#define CAST_INTEGER_2_NUMERIC_1(T1) \
CAST_INTEGER_2_NUMERIC_2(T1,bte); \
@@ -48,16 +48,16 @@ CAST_INTEGER_2_NUMERIC_1(lng);
#define CAST_FLOATINGPOINT_2_INTEGER_2(T1,T2) \
-sql5_export str T1##_2_##T2(T2 *res, T1 *v); \
-sql5_export str bat##T1##_2_##T2(bat *res, bat *v); \
-sql5_export str T1##_num2dec_##T2(T2 *res, T1 *v, int *d2, int *s2); \
-sql5_export str bat##T1##_num2dec_##T2(bat *res, bat *v, int *d2, int *s2)
+sql5_export str T1##_2_##T2(T2 *res, const T1 *v); \
+sql5_export str bat##T1##_2_##T2(bat *res, const bat *v); \
+sql5_export str T1##_num2dec_##T2(T2 *res, const T1 *v, const int *d2, const
int *s2); \
+sql5_export str bat##T1##_num2dec_##T2(bat *res, const bat *v, const int *d2,
const int *s2)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
