Changeset: 9d5dc3a2961c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9d5dc3a2961c
Modified Files:
clients/Tests/exports.stable.out
clients/mapiclient/msqldump.c
clients/mapilib/mapi.c
clients/mapilib/mapi.h
monetdb5/modules/mal/remote.c
tools/merovingian/daemon/multiplex-funnel.c
Branch: default
Log Message:
Some more const.
diffs (190 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
@@ -501,18 +501,18 @@ int mapi_fetch_row(MapiHdl hdl);
MapiMsg mapi_finish(MapiHdl hdl);
MapiHdl mapi_get_active(Mapi mid);
bool mapi_get_autocommit(Mapi mid);
-char *mapi_get_dbname(Mapi mid);
+const char *mapi_get_dbname(Mapi mid);
int mapi_get_digits(MapiHdl hdl, int fnr);
int mapi_get_field_count(MapiHdl hdl);
stream *mapi_get_from(Mapi mid);
-char *mapi_get_host(Mapi mid);
-char *mapi_get_lang(Mapi mid);
+const char *mapi_get_host(Mapi mid);
+const char *mapi_get_lang(Mapi mid);
int64_t mapi_get_last_id(MapiHdl hdl);
int mapi_get_len(MapiHdl hdl, int fnr);
int64_t mapi_get_maloptimizertime(MapiHdl hdl);
-char *mapi_get_mapi_version(Mapi mid);
-char *mapi_get_monet_version(Mapi mid);
-char *mapi_get_motd(Mapi mid);
+const char *mapi_get_mapi_version(Mapi mid);
+const char *mapi_get_monet_version(Mapi mid);
+const char *mapi_get_motd(Mapi mid);
char *mapi_get_name(MapiHdl hdl, int fnr);
char *mapi_get_query(MapiHdl hdl);
int64_t mapi_get_querytime(MapiHdl hdl);
@@ -525,8 +525,8 @@ int mapi_get_tableid(MapiHdl hdl);
stream *mapi_get_to(Mapi mid);
bool mapi_get_trace(Mapi mid);
char *mapi_get_type(MapiHdl hdl, int fnr);
-char *mapi_get_uri(Mapi mid);
-char *mapi_get_user(Mapi mid);
+const char *mapi_get_uri(Mapi mid);
+const char *mapi_get_user(Mapi mid);
bool mapi_is_connected(Mapi mid);
MapiMsg mapi_log(Mapi mid, const char *nme);
Mapi mapi_mapi(const char *host, int port, const char *username, const char
*password, const char *lang, const char *dbname);
@@ -535,7 +535,7 @@ bool mapi_more_results(MapiHdl hdl);
MapiMsg mapi_needmore(MapiHdl hdl);
MapiHdl mapi_new_handle(Mapi mid);
MapiMsg mapi_next_result(MapiHdl hdl);
-void mapi_noexplain(Mapi mid, char *errorprefix);
+void mapi_noexplain(Mapi mid, const char *errorprefix);
MapiMsg mapi_param(MapiHdl hdl, int fnr, char **ptr);
MapiMsg mapi_param_numeric(MapiHdl hdl, int fnr, int scale, int precision,
void *ptr);
MapiMsg mapi_param_string(MapiHdl hdl, int fnr, int sqltype, char *ptr, int
*sizeptr);
diff --git a/clients/mapiclient/msqldump.c b/clients/mapiclient/msqldump.c
--- a/clients/mapiclient/msqldump.c
+++ b/clients/mapiclient/msqldump.c
@@ -165,7 +165,7 @@ main(int argc, char **argv)
exit(2);
}
if (!quiet) {
- char *motd = mapi_get_motd(mid);
+ const char *motd = mapi_get_motd(mid);
if (motd)
fprintf(stderr, "%s", motd);
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -685,11 +685,11 @@
* @item char *mapi_get_table(MapiHdl hdl, int fnr)
* @item int mapi_get_len(Mapi mid, int fnr)
*
- * @item char *mapi_get_dbname(Mapi mid)
- * @item char *mapi_get_host(Mapi mid)
- * @item char *mapi_get_user(Mapi mid)
- * @item char *mapi_get_lang(Mapi mid)
- * @item char *mapi_get_motd(Mapi mid)
+ * @item const char *mapi_get_dbname(Mapi mid)
+ * @item const char *mapi_get_host(Mapi mid)
+ * @item const char *mapi_get_user(Mapi mid)
+ * @item const char *mapi_get_lang(Mapi mid)
+ * @item const char *mapi_get_motd(Mapi mid)
*
* @end itemize
* @- Implementation
@@ -5276,50 +5276,50 @@ mapi_get_sqloptimizertime(MapiHdl hdl)
return result->sqloptimizertime;
}
-char *
+const char *
mapi_get_dbname(Mapi mid)
{
return mid->database ? mid->database : "";
}
-char *
+const char *
mapi_get_host(Mapi mid)
{
return mid->hostname;
}
-char *
+const char *
mapi_get_user(Mapi mid)
{
return mid->username;
}
-char *
+const char *
mapi_get_lang(Mapi mid)
{
return mid->language;
}
-char *
+const char *
mapi_get_uri(Mapi mid)
{
return mid->uri;
}
-char *
+const char *
mapi_get_mapi_version(Mapi mid)
{
return mid->mapiversion;
}
-char *
+const char *
mapi_get_monet_version(Mapi mid)
{
mapi_check0(mid, "mapi_get_monet_version");
return mid->server ? mid->server : "";
}
-char *
+const char *
mapi_get_motd(Mapi mid)
{
mapi_check0(mid, "mapi_get_motd");
diff --git a/clients/mapilib/mapi.h b/clients/mapilib/mapi.h
--- a/clients/mapilib/mapi.h
+++ b/clients/mapilib/mapi.h
@@ -192,14 +192,14 @@ mapi_export size_t mapi_fetch_field_len(
mapi_export MapiMsg mapi_store_field(MapiHdl hdl, int fnr, int outtype, void
*outparam);
mapi_export char *mapi_fetch_line(MapiHdl hdl);
mapi_export int mapi_split_line(MapiHdl hdl);
-mapi_export char *mapi_get_lang(Mapi mid);
-mapi_export char *mapi_get_uri(Mapi mid);
-mapi_export char *mapi_get_dbname(Mapi mid);
-mapi_export char *mapi_get_host(Mapi mid);
-mapi_export char *mapi_get_user(Mapi mid);
-mapi_export char *mapi_get_mapi_version(Mapi mid);
-mapi_export char *mapi_get_monet_version(Mapi mid);
-mapi_export char *mapi_get_motd(Mapi mid);
+mapi_export const char *mapi_get_lang(Mapi mid);
+mapi_export const char *mapi_get_uri(Mapi mid);
+mapi_export const char *mapi_get_dbname(Mapi mid);
+mapi_export const char *mapi_get_host(Mapi mid);
+mapi_export const char *mapi_get_user(Mapi mid);
+mapi_export const char *mapi_get_mapi_version(Mapi mid);
+mapi_export const char *mapi_get_monet_version(Mapi mid);
+mapi_export const char *mapi_get_motd(Mapi mid);
mapi_export bool mapi_is_connected(Mapi mid);
mapi_export char *mapi_get_table(MapiHdl hdl, int fnr);
mapi_export char *mapi_get_name(MapiHdl hdl, int fnr);
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
@@ -193,8 +193,7 @@ str RMTconnectScen(
/* generate an unique connection name, they are only known
* within one mserver, id is primary key, the rest is super key */
- s = mapi_get_dbname(m);
- snprintf(conn, BUFSIZ, "%s_%s_%zu", s, *user, connection_id++);
+ snprintf(conn, BUFSIZ, "%s_%s_%zu", mapi_get_dbname(m), *user,
connection_id++);
/* make sure we can construct MAL identifiers using conn */
for (s = conn; *s != '\0'; s++) {
if (!isalnum((unsigned char)*s)) {
diff --git a/tools/merovingian/daemon/multiplex-funnel.c
b/tools/merovingian/daemon/multiplex-funnel.c
--- a/tools/merovingian/daemon/multiplex-funnel.c
+++ b/tools/merovingian/daemon/multiplex-funnel.c
@@ -167,7 +167,7 @@ MFconnectionManager(void *d)
sabdb *walk;
sabdb *stats =
getRemoteDB(m->dbcv[i]->database);
Mapi tm =
m->dbcv[i]->conn;
- char *uri =
mapi_get_uri(tm);
+ const char *uri =
mapi_get_uri(tm);
if (stats == NULL) {
Mfprintf(stderr, "target %s can no longer "
"be resolved\n",
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
