Changeset: 72e01035f584 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=72e01035f584
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_utils.c
gdk/gdk_utils.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_session.c
monetdb5/modules/mal/inspect.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/remote.c
sql/backends/monet5/UDF/pyapi/pyapi.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_scenario.c
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: default
Log Message:
GDKgetenv() returns a string that the caller cannot modify, so make it const.
diffs (truncated from 353 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
@@ -248,7 +248,7 @@ bit GDKfataljumpenable;
str GDKfatalmsg;
char *GDKfilepath(int farmid, const char *dir, const char *nme, const char
*ext);
void GDKfree(void *blk);
-char *GDKgetenv(const char *name);
+const char *GDKgetenv(const char *name);
int GDKgetenv_int(const char *name, int def);
bool GDKgetenv_istext(const char *name, const char *text);
bool GDKgetenv_istrue(const char *name);
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -92,7 +92,7 @@ GDKenvironment(const char *dbpath)
return true;
}
-char *
+const char *
GDKgetenv(const char *name)
{
BUN b = BUNfnd(GDKkey, (ptr) name);
@@ -127,7 +127,7 @@ GDKgetenv_istrue(const char *name)
int
GDKgetenv_int(const char *name, int def)
{
- char *val = GDKgetenv(name);
+ const char *val = GDKgetenv(name);
if (val)
return atoi(val);
@@ -428,7 +428,7 @@ gdk_return
GDKinit(opt *set, int setlen)
{
char *dbpath = mo_find_option(set, setlen, "gdk_dbpath");
- char *p;
+ const char *p;
opt *n;
int i, nlen = 0;
int farmid;
diff --git a/gdk/gdk_utils.h b/gdk/gdk_utils.h
--- a/gdk/gdk_utils.h
+++ b/gdk/gdk_utils.h
@@ -12,7 +12,7 @@
#include "monet_options.h"
#include <setjmp.h>
-gdk_export char *GDKgetenv(const char *name);
+gdk_export const char *GDKgetenv(const char *name);
gdk_export bool GDKgetenv_istext(const char *name, const char* text);
gdk_export bool GDKgetenv_isyes(const char *name);
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -64,7 +64,7 @@ mal_client_reset(void)
void
MCinit(void)
{
- char *max_clients = GDKgetenv("max_clients");
+ const char *max_clients = GDKgetenv("max_clients");
int maxclients = 0;
if (max_clients != NULL)
@@ -201,7 +201,7 @@ MCexitClient(Client c)
Client
MCinitClientRecord(Client c, oid user, bstream *fin, stream *fout)
{
- str prompt;
+ const char *prompt;
c->user = user;
c->username = 0;
diff --git a/monetdb5/mal/mal_linker.c b/monetdb5/mal/mal_linker.c
--- a/monetdb5/mal/mal_linker.c
+++ b/monetdb5/mal/mal_linker.c
@@ -148,7 +148,7 @@ loadLibrary(str filename, int flag)
void *handle = NULL;
str s;
int idx;
- char *mod_path = GDKgetenv("monet_mod_path");
+ const char *mod_path = GDKgetenv("monet_mod_path");
/* AIX requires RTLD_MEMBER to load a module that is a member of an
* archive. */
@@ -179,7 +179,7 @@ loadLibrary(str filename, int flag)
}
while (*mod_path) {
- char *p;
+ const char *p;
for (p = mod_path; *p && *p != PATH_SEP; p++)
;
@@ -305,7 +305,7 @@ cmpstr(const void *_p1, const void *_p2)
char *
locate_file(const char *basename, const char *ext, bit recurse)
{
- char *mod_path = GDKgetenv("monet_mod_path");
+ const char *mod_path = GDKgetenv("monet_mod_path");
char *fullname;
size_t fullnamelen;
size_t filelen = strlen(basename) + strlen(ext);
@@ -325,7 +325,7 @@ locate_file(const char *basename, const
return NULL;
while (*mod_path) {
size_t i;
- char *p;
+ const char *p;
int fd;
DIR *rdir;
diff --git a/monetdb5/mal/mal_session.c b/monetdb5/mal/mal_session.c
--- a/monetdb5/mal/mal_session.c
+++ b/monetdb5/mal/mal_session.c
@@ -198,7 +198,8 @@ void
MSscheduleClient(str command, str challenge, bstream *fin, stream *fout,
protocol_version protocol, size_t blocksize)
{
char *user = command, *algo = NULL, *passwd = NULL, *lang = NULL;
- char *database = NULL, *s, *dbname;
+ char *database = NULL, *s;
+ const char *dbname;
str msg = MAL_SUCCEED;
bool filetrans = false;
Client c;
diff --git a/monetdb5/modules/mal/inspect.c b/monetdb5/modules/mal/inspect.c
--- a/monetdb5/modules/mal/inspect.c
+++ b/monetdb5/modules/mal/inspect.c
@@ -531,7 +531,7 @@ INSPECTgetEnvironment(bat *ret, bat *ret
str
INSPECTgetEnvironmentKey(str *ret, str *key)
{
- str s;
+ const char *s;
*ret = 0;
s= GDKgetenv(*key);
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -539,7 +539,7 @@ static void SERVERannounce(struct in_add
}
static str
-SERVERlisten(int *Port, str *Usockfile, int *Maxusers)
+SERVERlisten(int *Port, const char *Usockfile, int *Maxusers)
{
struct sockaddr_in server;
SOCKET sock = INVALID_SOCKET;
@@ -576,12 +576,12 @@ SERVERlisten(int *Port, str *Usockfile,
port = *Port;
if (Usockfile == NULL || *Usockfile == 0 ||
- *Usockfile[0] == '\0' || strcmp(*Usockfile, str_nil) == 0)
+ strcmp(Usockfile, str_nil) == 0)
{
usockfile = NULL;
} else {
#ifdef HAVE_SYS_UN_H
- usockfile = GDKstrdup(*Usockfile);
+ usockfile = GDKstrdup(Usockfile);
if (usockfile == NULL) {
GDKfree(psock);
throw(MAL,"mal_mapi.listen", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
@@ -856,7 +856,7 @@ str
SERVERlisten_default(int *ret)
{
int port = SERVERPORT;
- str p;
+ const char *p;
int maxusers = SERVERMAXUSERS;
(void) ret;
@@ -864,7 +864,7 @@ SERVERlisten_default(int *ret)
if (p)
port = (int) strtol(p, NULL, 10);
p = GDKgetenv("mapi_usock");
- return SERVERlisten(&port, &p, &maxusers);
+ return SERVERlisten(&port, p, &maxusers);
}
str
@@ -872,7 +872,7 @@ SERVERlisten_usock(int *ret, str *usock)
{
int maxusers = SERVERMAXUSERS;
(void) ret;
- return SERVERlisten(0, usock, &maxusers);
+ return SERVERlisten(0, usock ? *usock : NULL, &maxusers);
}
str
@@ -882,7 +882,7 @@ SERVERlisten_port(int *ret, int *pid)
int maxusers = SERVERMAXUSERS;
(void) ret;
- return SERVERlisten(&port, 0, &maxusers);
+ return SERVERlisten(&port, NULL, &maxusers);
}
/*
* The internet connection listener may be terminated from the server console,
diff --git a/monetdb5/modules/mal/mdb.c b/monetdb5/modules/mal/mdb.c
--- a/monetdb5/modules/mal/mdb.c
+++ b/monetdb5/modules/mal/mdb.c
@@ -668,7 +668,7 @@ TBL_getdir(void)
BAT *b = COLnew(0, TYPE_str, 100, TRANSIENT);
int i = 0;
- char *mod_path;
+ const char *mod_path;
size_t extlen = strlen(MAL_EXT);
size_t len;
struct dirent *dent;
@@ -687,7 +687,7 @@ TBL_getdir(void)
while (mod_path || dirp) {
if (dirp == NULL) {
char *cur_dir;
- char *p;
+ const char *p;
size_t l;
if ((p = strchr(mod_path, PATH_SEP)) != NULL) {
diff --git a/monetdb5/modules/mal/remote.c b/monetdb5/modules/mal/remote.c
--- a/monetdb5/modules/mal/remote.c
+++ b/monetdb5/modules/mal/remote.c
@@ -89,7 +89,7 @@ str RMTresolve(bat *ret, str *pat) {
"your platform, sorry"); /* please upgrade to Linux,
etc. */
#else
BAT *list;
- char *mero_uri;
+ const char *mero_uri;
char *p;
unsigned int port;
char **redirs;
diff --git a/sql/backends/monet5/UDF/pyapi/pyapi.c
b/sql/backends/monet5/UDF/pyapi/pyapi.c
--- a/sql/backends/monet5/UDF/pyapi/pyapi.c
+++ b/sql/backends/monet5/UDF/pyapi/pyapi.c
@@ -55,10 +55,9 @@ static void ComputeParallelAggregation(A
static void CreateEmptyReturn(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci,
size_t retcols, oid
seqbase);
-static char *FunctionBasePath(void);
-static char *FunctionBasePath(void)
+static const char *FunctionBasePath(void)
{
- char *basepath = GDKgetenv("function_basepath");
+ const char *basepath = GDKgetenv("function_basepath");
if (basepath == NULL) {
basepath = getenv("HOME");
}
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -905,7 +905,7 @@ backend_create_r_func(backend *be, sql_f
// defaults to python 2 if none is enabled
static int
enabled_python_version(void) {
- char* env = GDKgetenv(pyapi_enableflag);
+ const char* env = GDKgetenv(pyapi_enableflag);
if (env && strncmp(env, "3", 1) == 0) {
return 3;
}
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -49,7 +49,7 @@
static int SQLinitialized = 0;
static int SQLnewcatalog = 0;
int SQLdebug = 0;
-static char *sqlinit = NULL;
+static const char *sqlinit = NULL;
MT_Lock sql_contextLock MT_LOCK_INITIALIZER("sql_contextLock");
static void
@@ -87,7 +87,7 @@ str
SQLsession(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str msg = MAL_SUCCEED;
- str logmsg;
+ const char *logmsg;
int cnt=0;
(void) mb;
@@ -110,7 +110,7 @@ str
SQLsession2(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str msg = MAL_SUCCEED;
- str logmsg;
+ const char *logmsg;
int cnt=0;
(void) mb;
@@ -228,7 +228,7 @@ SQLepilogue(void *ret)
}
#define SQLglobal(name, val, failure)
\
- if(!stack_push_var(sql, name, &ctype) || !stack_set_var(sql, name,
VALset(&src, ctype.type->localtype, val))) \
+ if(!stack_push_var(sql, name, &ctype) || !stack_set_var(sql, name,
VALset(&src, ctype.type->localtype, (char*)(val)))) \
failure--;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
