Changeset: e5f4684ac908 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e5f4684ac908
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_interprocess.c
gdk/gdk_interprocess.h
gdk/gdk_strimps.c
gdk/gdk_strimps.h
Branch: Jan2022
Log Message:
Change some args to const char *.
Note, "const str" is *not* the same as "const char *", and it's
almost invariably the latter that you want.
diffs (113 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
@@ -260,8 +260,8 @@ gdk_return GDKanalyticalprod(BAT *r, BAT
gdk_return GDKanalyticalsum(BAT *r, BAT *p, BAT *o, BAT *b, BAT *s, BAT *e,
int tp1, int tp2, int frame_type);
gdk_return GDKanalyticalwindowbounds(BAT *r, BAT *b, BAT *p, BAT *l, const
void *restrict bound, int tp1, int tp2, int unit, bool preceding, oid
first_half);
int GDKatomcnt;
-size_t GDKbatcopy(char *dest, BAT *bat, str colname);
-size_t GDKbatcopysize(BAT *bat, str colname);
+size_t GDKbatcopy(char *dest, BAT *bat, const char *colname);
+size_t GDKbatcopysize(BAT *bat, const char *colname);
size_t GDKbatread(char *src, BAT **bat, str *colname);
gdk_return GDKchangesemval(int sem_id, int number, int change);
gdk_return GDKchangesemval_timeout(int sem_id, int number, int change, int
timeout_mseconds, bool *succeed);
@@ -393,9 +393,9 @@ BUN ORDERfndlast(BAT *b, Heap *oidxh, co
BUN SORTfnd(BAT *b, const void *v);
BUN SORTfndfirst(BAT *b, const void *v);
BUN SORTfndlast(BAT *b, const void *v);
-gdk_return STRMPappendBitstring(BAT *b, const str s);
+gdk_return STRMPappendBitstring(BAT *b, const char *s);
gdk_return STRMPcreate(BAT *b, BAT *s);
-BAT *STRMPfilter(BAT *b, BAT *s, const str q);
+BAT *STRMPfilter(BAT *b, BAT *s, const char *q);
MT_Id THRcreate(void (*f)(void *), void *arg, enum MT_thr_detach d, const char
*name);
void *THRdata[THREADDATA];
void THRdel(Thread t);
diff --git a/gdk/gdk_interprocess.c b/gdk/gdk_interprocess.c
--- a/gdk/gdk_interprocess.c
+++ b/gdk/gdk_interprocess.c
@@ -268,7 +268,7 @@ GDKreleasesem(int sem_id)
#define align(sz) ((sz + 7) & ~7)
size_t
-GDKbatcopysize(BAT *bat, str colname)
+GDKbatcopysize(BAT *bat, const char *colname)
{
size_t size = 0;
@@ -284,7 +284,7 @@ GDKbatcopysize(BAT *bat, str colname)
}
size_t
-GDKbatcopy(char *dest, BAT *bat, str colname)
+GDKbatcopy(char *dest, BAT *bat, const char *colname)
{
MT_lock_set(&bat->theaplock);
size_t batsize = bat->twidth * BATcount(bat);
diff --git a/gdk/gdk_interprocess.h b/gdk/gdk_interprocess.h
--- a/gdk/gdk_interprocess.h
+++ b/gdk/gdk_interprocess.h
@@ -55,9 +55,9 @@ gdk_export gdk_return GDKreleasesem(int
*/
//! Returns the size of the buffer necessary to copy the BAT into
-gdk_export size_t GDKbatcopysize(BAT *bat, str colname);
+gdk_export size_t GDKbatcopysize(BAT *bat, const char *colname);
//! Copies a BAT into the given destination. Returns the amount of bytes
copied (equiv. to GDKbatcopysize(bat))
-gdk_export size_t GDKbatcopy(char *dest, BAT *bat, str colname);
+gdk_export size_t GDKbatcopy(char *dest, BAT *bat, const char *colname);
//! Reads a BAT from the given source (one that was copied into by GDKbatcopy)
gdk_export size_t GDKbatread(char *src, BAT **bat, str *colname);
diff --git a/gdk/gdk_strimps.c b/gdk/gdk_strimps.c
--- a/gdk/gdk_strimps.c
+++ b/gdk/gdk_strimps.c
@@ -194,7 +194,7 @@ STRMPpairLookup(Strimps *s, CharPair *p)
*
*/
static uint64_t
-STRMPmakebitstring(const str s, Strimps *r)
+STRMPmakebitstring(const char *s, Strimps *r)
{
uint64_t ret = 0;
int8_t pair_idx = 0;
@@ -505,7 +505,7 @@ BATcheckstrimps(BAT *b)
* list.
*/
BAT *
-STRMPfilter(BAT *b, BAT *s, const str q)
+STRMPfilter(BAT *b, BAT *s, const char *q)
{
BAT *r = NULL;
BUN i, ncand, j = 0;
@@ -765,7 +765,7 @@ STRMPcreate(BAT *b, BAT *s)
}
gdk_return
-STRMPappendBitstring(BAT *b, const str s)
+STRMPappendBitstring(BAT *b, const char *s)
{
lng t0 = 0;
BAT *pb;
diff --git a/gdk/gdk_strimps.h b/gdk/gdk_strimps.h
--- a/gdk/gdk_strimps.h
+++ b/gdk/gdk_strimps.h
@@ -25,7 +25,7 @@ typedef struct {
typedef struct {
size_t pos;
size_t lim;
- str s;
+ const char *s;
} PairIterator;
typedef struct {
@@ -35,6 +35,6 @@ typedef struct {
gdk_export gdk_return STRMPcreate(BAT *b, BAT *s);
-gdk_export BAT *STRMPfilter(BAT *b, BAT *s, const str q);
-gdk_export gdk_return STRMPappendBitstring(BAT *b, const str s);
+gdk_export BAT *STRMPfilter(BAT *b, BAT *s, const char *q);
+gdk_export gdk_return STRMPappendBitstring(BAT *b, const char *s);
#endif /* _GDK_STRIMPS_H_ */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
