Changeset: 18e38d267a78 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/18e38d267a78
Modified Files:
monetdb5/modules/atoms/str.c
monetdb5/modules/kernel/batstr.c
sql/backends/monet5/UDF/capi/capi.c
sql/server/sql_scan.c
sql/storage/bat/bat_logger.c
tools/merovingian/daemon/handlers.c
tools/merovingian/utils/utils.c
tools/mserver/mserver5.c
tools/mserver/shutdowntest.c
Branch: Jan2022
Log Message:
More const
diffs (117 lines):
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -4726,7 +4726,7 @@ STRspace(str *res, const int *ll)
if (is_int_nil(l) || l < 0) {
*res = GDKstrdup(str_nil);
} else {
- char space[] = " ", *s= space;
+ const char space[] = " ", *s= space;
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -317,7 +317,7 @@ STRbatSpace(Client cntxt, MalBlkPtr mb,
int *restrict vals, x;
str buf = GDKmalloc(buflen), msg = MAL_SUCCEED;
bool nils = false;
- char space[]= " ", *s = space;
+ const char space[]= " ", *s = space;
struct canditer ci1 = {0};
oid off1;
bat *res = getArgReference_bat(stk, pci, 0), *bid =
getArgReference_bat(stk, pci, 1),
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -377,7 +377,7 @@ static daytime time_from_data(cudf_data_
static void data_from_timestamp(timestamp d, cudf_data_timestamp *ptr);
static timestamp timestamp_from_data(cudf_data_timestamp *ptr);
-static char valid_path_characters[] = "abcdefghijklmnopqrstuvwxyz";
+static const char valid_path_characters[] = "abcdefghijklmnopqrstuvwxyz";
static str
empty_return(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, size_t retcols, oid
seqbase)
diff --git a/sql/server/sql_scan.c b/sql/server/sql_scan.c
--- a/sql/server/sql_scan.c
+++ b/sql/server/sql_scan.c
@@ -589,7 +589,7 @@ U-04000000 - U-7FFFFFFF: 1111110x 10xxxx
utf8chkmsk[n] should be non-zero (else the encoding could be
shorter).
*/
-static int utf8chkmsk[] = {
+static const int utf8chkmsk[] = {
0x0000007f,
0x00000780,
0x0000f800,
diff --git a/sql/storage/bat/bat_logger.c b/sql/storage/bat/bat_logger.c
--- a/sql/storage/bat/bat_logger.c
+++ b/sql/storage/bat/bat_logger.c
@@ -139,7 +139,7 @@ tabins(logger *lg, old_logger *old_lg, b
}
#endif
-struct table {
+const struct table {
const char *schema;
const char *table;
const char *column;
@@ -1298,7 +1298,7 @@ struct table {
};
/* more system tables with schema/table/column ids that need to be remapped */
-struct mapids {
+const struct mapids {
// const char *schema; /* always "sys" */
const char *table;
const char *column;
diff --git a/tools/merovingian/daemon/handlers.c
b/tools/merovingian/daemon/handlers.c
--- a/tools/merovingian/daemon/handlers.c
+++ b/tools/merovingian/daemon/handlers.c
@@ -338,7 +338,7 @@ segvhandler(int sig) {
sigaction(SIGSEGV, &sa, NULL);
if (_mero_topdp != NULL) {
- char errmsg[] = "\nSEGMENTATION FAULT OCCURRED\n"
+ const char errmsg[] = "\nSEGMENTATION FAULT OCCURRED\n"
"\nA fatal error has occurred which prevents
monetdbd from operating."
"\nThis is likely a bug in monetdbd, please
report it on https://github.com/MonetDB/MonetDB/issues/";
"\nand include the tail of this log in your
bugreport with your explanation of "
diff --git a/tools/merovingian/utils/utils.c b/tools/merovingian/utils/utils.c
--- a/tools/merovingian/utils/utils.c
+++ b/tools/merovingian/utils/utils.c
@@ -398,7 +398,7 @@ abbreviateString(char *ret, const char *
}
}
-static char seedChars[] = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
+static const char seedChars[] = {'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i',
'j',
'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x',
'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
diff --git a/tools/mserver/mserver5.c b/tools/mserver/mserver5.c
--- a/tools/mserver/mserver5.c
+++ b/tools/mserver/mserver5.c
@@ -306,7 +306,7 @@ main(int argc, char **av)
char *dbtrace = NULL;
bool inmemory = false;
bool readpwdxit = false;
- static struct option long_options[] = {
+ static const struct option long_options[] = {
{ "config", required_argument, NULL, 'c' },
{ "dbextra", required_argument, NULL, 0 },
{ "dbpath", required_argument, NULL, 0 },
diff --git a/tools/mserver/shutdowntest.c b/tools/mserver/shutdowntest.c
--- a/tools/mserver/shutdowntest.c
+++ b/tools/mserver/shutdowntest.c
@@ -133,7 +133,7 @@ static str monetdb_initialize(void) {
* bin/mserver5 -> ../
* libX/monetdb5/lib/
* probe libX = lib, lib32, lib64, lib/64 */
- char *libdirs[] = { "lib", "lib64", "lib/64", "lib32", NULL };
+ const char *libdirs[] = { "lib", "lib64", "lib/64", "lib32",
NULL };
size_t i;
struct stat sb;
if (binpath != NULL) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
