Changeset: dabf4fd3cc1d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dabf4fd3cc1d
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_utils.c
Branch: default
Log Message:
Use const char *.
diffs (186 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
@@ -527,15 +527,15 @@ int dlclose(void *handle);
char *dlerror(void);
void *dlopen(const char *file, int mode);
void *dlsym(void *handle, const char *name);
-_Noreturn void eb_error(exception_buffer *eb, char *msg, int val);
+_Noreturn void eb_error(exception_buffer *eb, const char *msg, int val);
exception_buffer *eb_init(exception_buffer *eb)
__attribute__((__access__(write_only, 1)));
size_t escapedStr(char *restrict dst, const char *restrict src, size_t dstlen,
const char *sep1, const char *sep2, int quote);
size_t escapedStrlen(const char *restrict src, const char *sep1, const char
*sep2, int quote);
ssize_t fltFromStr(const char *src, size_t *len, flt **dst, bool external);
ssize_t fltToStr(str *dst, size_t *len, const flt *src, bool external);
const flt flt_nil;
-gdk_return gdk_add_callback(char *name, gdk_callback_func *f, int argc, void
*argv[], int interval);
-gdk_return gdk_remove_callback(char *, gdk_callback_func *f);
+gdk_return gdk_add_callback(const char *name, gdk_callback_func *f, int argc,
void *argv[], int interval);
+gdk_return gdk_remove_callback(const char *, gdk_callback_func *f);
bat getBBPsize(void);
char *get_bin_path(void);
int gettimeofday(struct timeval *tv, int *ignore_zone);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2532,7 +2532,7 @@ TIMEOUT_TEST(QryCtx *qc)
} while (0)
typedef struct gdk_callback {
- char *name;
+ const char *name;
int argc;
int interval; // units sec
lng last_called; // timestamp GDKusec
@@ -2543,9 +2543,9 @@ typedef struct gdk_callback {
typedef gdk_return gdk_callback_func(int argc, void *argv[]);
-gdk_export gdk_return gdk_add_callback(char *name, gdk_callback_func *f, int
argc, void
- *argv[], int interval);
-gdk_export gdk_return gdk_remove_callback(char *, gdk_callback_func *f);
+gdk_export gdk_return gdk_add_callback(const char *name, gdk_callback_func *f,
+ int argc, void *argv[], int interval);
+gdk_export gdk_return gdk_remove_callback(const char *, gdk_callback_func *f);
#include <setjmp.h>
@@ -2557,7 +2557,7 @@ typedef struct exception_buffer {
jmp_buf state;
#endif
int code;
- char *msg;
+ const char *msg;
int enabled;
} exception_buffer;
@@ -2570,7 +2570,7 @@ gdk_export exception_buffer *eb_init(exc
#else
#define eb_savepoint(eb) ((eb)->enabled = 1, setjmp((eb)->state))
#endif
-gdk_export _Noreturn void eb_error(exception_buffer *eb, char *msg, int val);
+gdk_export _Noreturn void eb_error(exception_buffer *eb, const char *msg, int
val);
typedef struct allocator {
struct allocator *pa;
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -4457,7 +4457,7 @@ static struct {
* Adds new callback to the callback list.
*/
gdk_return
-gdk_add_callback(char *name, gdk_callback_func *f, int argc, void *argv[], int
+gdk_add_callback(const char *name, gdk_callback_func *f, int argc, void
*argv[], int
interval)
{
@@ -4512,7 +4512,7 @@ gdk_add_callback(char *name, gdk_callbac
* Removes a callback from the callback list with a given name as an argument.
*/
gdk_return
-gdk_remove_callback(char *cb_name, gdk_callback_func *argsfree)
+gdk_remove_callback(const char *cb_name, gdk_callback_func *argsfree)
{
gdk_callback *prev = NULL;
gdk_return res = GDK_FAIL;
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -2056,7 +2056,7 @@ eb_init(exception_buffer *eb)
}
void
-eb_error( exception_buffer *eb, char *msg, int val )
+eb_error(exception_buffer *eb, const char *msg, int val)
{
eb->code = val;
eb->msg = msg;
@@ -2076,7 +2076,7 @@ typedef struct freed_t {
} freed_t;
static void
-sa_destroy_freelist( freed_t *f )
+sa_destroy_freelist(freed_t *f)
{
while(f) {
freed_t *n = f->n;
@@ -2152,7 +2152,7 @@ sa_create(allocator *pa)
return sa;
}
-allocator *sa_reset( allocator *sa )
+allocator *sa_reset(allocator *sa)
{
size_t i ;
@@ -2171,7 +2171,7 @@ allocator *sa_reset( allocator *sa )
#undef sa_realloc
#undef sa_alloc
void *
-sa_realloc( allocator *sa, void *p, size_t sz, size_t oldsz )
+sa_realloc(allocator *sa, void *p, size_t sz, size_t oldsz)
{
void *r = sa_alloc(sa, sz);
@@ -2182,7 +2182,7 @@ sa_realloc( allocator *sa, void *p, size
#define round16(sz) ((sz+15)&~15)
void *
-sa_alloc( allocator *sa, size_t sz )
+sa_alloc(allocator *sa, size_t sz)
{
char *r;
sz = round16(sz);
@@ -2235,7 +2235,7 @@ sa_alloc( allocator *sa, size_t sz )
}
#undef sa_zalloc
-void *sa_zalloc( allocator *sa, size_t sz )
+void *sa_zalloc(allocator *sa, size_t sz)
{
void *r = sa_alloc(sa, sz);
@@ -2244,7 +2244,7 @@ void *sa_zalloc( allocator *sa, size_t s
return r;
}
-void sa_destroy( allocator *sa )
+void sa_destroy(allocator *sa)
{
if (sa->pa) {
sa_reset(sa);
@@ -2261,7 +2261,7 @@ void sa_destroy( allocator *sa )
}
#undef sa_strndup
-char *sa_strndup( allocator *sa, const char *s, size_t l)
+char *sa_strndup(allocator *sa, const char *s, size_t l)
{
char *r = sa_alloc(sa, l+1);
@@ -2273,12 +2273,12 @@ char *sa_strndup( allocator *sa, const c
}
#undef sa_strdup
-char *sa_strdup( allocator *sa, const char *s )
+char *sa_strdup(allocator *sa, const char *s)
{
- return sa_strndup( sa, s, strlen(s));
+ return sa_strndup(sa, s, strlen(s));
}
-char *sa_strconcat( allocator *sa, const char *s1, const char *s2 )
+char *sa_strconcat(allocator *sa, const char *s1, const char *s2)
{
size_t l1 = strlen(s1);
size_t l2 = strlen(s2);
@@ -2292,7 +2292,7 @@ char *sa_strconcat( allocator *sa, const
return r;
}
-size_t sa_size( allocator *sa )
+size_t sa_size(allocator *sa)
{
return sa->usedmem;
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
