Changeset: a31c57b6b074 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a31c57b6b074
Modified Files:
common/utils/msabaoth.c
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/forkmserver.c
tools/merovingian/daemon/handlers.c
tools/merovingian/daemon/merovingian.c
tools/merovingian/daemon/multiplex-funnel.c
tools/merovingian/utils/glob.c
Branch: Nov2019
Log Message:
s/lateron/later on/g
diffs (147 lines):
diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -138,7 +138,7 @@ msab_init(const char *dbfarm, const char
if (_sabaoth_internal_dbname != NULL)
free(_sabaoth_internal_dbname);
- /* this UUID is supposed to be unique per-process, we use it lateron
+ /* this UUID is supposed to be unique per-process, we use it later on
* to determine if a database is (started by) the current process,
* since locking always succeeds for the same process */
if (_sabaoth_internal_uuid == NULL)
diff --git a/tools/merovingian/client/monetdb.c
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -506,7 +506,7 @@ globMatchDBS(int argc, char *argv[], sab
/* move out of orig into w, such that
we can't
* get double matches in the same
output list
* (as side effect also avoids a double
free
- * lateron) */
+ * later on) */
if (w == NULL) {
top = w = stats;
} else {
@@ -737,7 +737,7 @@ command_status(int argc, char *argv[])
}
}
/* make this option no longer available, for easy use
- * lateron */
+ * later on */
argv[i] = NULL;
} else {
doall = 0;
@@ -1043,7 +1043,7 @@ command_startstop(int argc, char *argv[]
}
}
/* make this option no longer available, for easy use
- * lateron */
+ * later on */
argv[i] = NULL;
}
}
@@ -1148,7 +1148,7 @@ command_set(int argc, char *argv[], mero
}
}
/* make this option no longer available, for easy use
- * lateron */
+ * later on */
argv[i] = NULL;
} else if (property[0] == '\0') {
/* first non-option is property, rest is database */
@@ -1282,7 +1282,7 @@ command_get(int argc, char *argv[])
}
}
/* make this option no longer available, for easy use
- * lateron */
+ * later on */
argv[i] = NULL;
} else if (property == NULL) {
/* first non-option is property, rest is database */
@@ -1815,7 +1815,7 @@ main(int argc, char *argv[])
fprintf(stderr, "monetdb: cannot find a control socket,
use -h and/or -p\n");
exit(1);
}
- /* don't confuse control_send lateron */
+ /* don't confuse control_send later on */
mero_port = -1;
}
/* for TCP connections */
diff --git a/tools/merovingian/daemon/forkmserver.c
b/tools/merovingian/daemon/forkmserver.c
--- a/tools/merovingian/daemon/forkmserver.c
+++ b/tools/merovingian/daemon/forkmserver.c
@@ -430,7 +430,7 @@ forkMserver(char *database, sabdb** stat
}
/* check if the vaultkey is there, otherwise abort early (value
- * lateron reused when server is started) */
+ * later on reused when server is started) */
snprintf(vaultkey, sizeof(vaultkey), "%s/.vaultkey", (*stats)->path);
if (stat(vaultkey, &statbuf) == -1) {
msab_freeStatus(stats);
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
@@ -114,7 +114,7 @@ void reinitialize(void)
readProps(_mero_props, ".");
/* check and trim the hash-algo from the passphrase for easy use
- * lateron */
+ * later on */
kv = findConfKey(_mero_props, "passphrase");
if (kv->val != NULL) {
char *h = kv->val + 1;
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -101,7 +101,7 @@ typedef struct _threadlist {
char *_mero_mserver = NULL;
/* list of databases that we have started */
dpair _mero_topdp = NULL;
-/* lock to _mero_topdp, initialised as recursive lateron */
+/* lock to _mero_topdp, initialised as recursive later on */
pthread_mutex_t _mero_topdp_lock = PTHREAD_MUTEX_INITIALIZER;
/* for the logger, when set to 0, the logger terminates */
volatile int _mero_keep_logging = 1;
@@ -662,7 +662,7 @@ main(int argc, char *argv[])
discovery = getConfNum(_mero_props, "discovery");
/* check and trim the hash-algo from the passphrase for easy use
- * lateron */
+ * later on */
kv = findConfKey(_mero_props, "passphrase");
if (kv->val != NULL) {
char *h = kv->val + 1;
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
@@ -622,7 +622,7 @@ multiplexQuery(multiplex *m, char *buf,
rlen += mapi_rows_affected(h);
break;
case Q_SCHEMA:
- /* accept, just write ok lateron */
+ /* accept, just write ok later on */
break;
case Q_TRANS:
/* just check all servers end up in the same
state */
diff --git a/tools/merovingian/utils/glob.c b/tools/merovingian/utils/glob.c
--- a/tools/merovingian/utils/glob.c
+++ b/tools/merovingian/utils/glob.c
@@ -41,7 +41,7 @@ db_glob(const char *expr, const char *ha
switch (*expr) {
case '*':
if (!escape) {
- /* store expression position for retry
lateron */
+ /* store expression position for retry
later on */
exprmem = expr;
/* skip over haystack till the next
char from expr */
do {
@@ -61,7 +61,7 @@ db_glob(const char *expr, const char *ha
} while(1);
while (*haystack != '\0' && *haystack
!= *expr)
haystack++;
- /* store match position, for retry
lateron */
+ /* store match position, for retry
later on */
haymem = haystack + 1;
if (*haystack == '\0')
/* couldn't find it, so no
match */
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
