Changeset: b3c5679b53cc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b3c5679b53cc
Modified Files:
tools/merovingian/daemon/forkmserver.c
Branch: Oct2014
Log Message:
Layout.
diffs (42 lines):
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
@@ -487,22 +487,22 @@ forkMserver(char *database, sabdb** stat
(*stats)->conns->val != NULL &&
(*stats)->scens != NULL &&
(*stats)->scens->val != NULL)
- {
- sablist *scen = (*stats)->scens;
- do {
- if (scen->val != NULL &&
strcmp(scen->val, "sql") == 0)
- break;
- } while ((scen = scen->next) != NULL);
- if (scen == NULL) {
- /* we don't know what it's
doing, but we don't like it
- * any case, so kill it */
- terminateProcess(dp);
- msab_freeStatus(stats);
-
pthread_mutex_unlock(&fork_lock);
- return(newErr("database '%s'
did not initialise the sql "
-
"scenario", database));
- }
- } else if (dp != NULL) {
+ {
+ sablist *scen = (*stats)->scens;
+ do {
+ if (scen->val != NULL &&
strcmp(scen->val, "sql") == 0)
+ break;
+ } while ((scen = scen->next) != NULL);
+ if (scen == NULL) {
+ /* we don't know what it's doing, but
we don't like it
+ * any case, so kill it */
+ terminateProcess(dp);
+ msab_freeStatus(stats);
+ pthread_mutex_unlock(&fork_lock);
+ return(newErr("database '%s' did not
initialise the sql "
+ "scenario",
database));
+ }
+ } else if (dp != NULL) {
terminateProcess(dp);
msab_freeStatus(stats);
pthread_mutex_unlock(&fork_lock);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
