Changeset: 85c1476037b7 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=85c1476037b7
Modified Files:
MonetDB5/src/mal/mal_errors.mx
MonetDB5/src/modules/mal/mal_mapi.mx
Branch: Jun2010
Log Message:
normalise 'operation failed' messages
diffs (93 lines):
diff -r 986a0834e2fe -r 85c1476037b7 MonetDB5/src/mal/mal_errors.mx
--- a/MonetDB5/src/mal/mal_errors.mx Mon Jul 26 11:38:04 2010 +0200
+++ b/MonetDB5/src/mal/mal_errors.mx Mon Jul 26 11:46:37 2010 +0200
@@ -98,7 +98,7 @@
#define RUNTIME_OBJECT_UNDEFINED "Object not found"
#define RUNTIME_UNKNOWN_INSTRUCTION "Instruction type not supported"
#define RUNTIME_QRY_TIMEOUT "Query aborted due to timeout"
-#define OPERATION_FAILED "Operation failed"
+#define OPERATION_FAILED "operation failed"
#define BOX_CLOSED "Box is not open"
diff -r 986a0834e2fe -r 85c1476037b7 MonetDB5/src/modules/mal/mal_mapi.mx
--- a/MonetDB5/src/modules/mal/mal_mapi.mx Mon Jul 26 11:38:04 2010 +0200
+++ b/MonetDB5/src/modules/mal/mal_mapi.mx Mon Jul 26 11:46:37 2010 +0200
@@ -675,20 +675,20 @@
usockfile = GDKstrdup(*Usockfile);
#else
usockfile = NULL;
- throw(IO, "mal_mapi.listen", OPERATION_FAILED " Unix domain
sockets are not supported");
+ throw(IO, "mal_mapi.listen", OPERATION_FAILED ": UNIX domain
sockets are not supported");
#endif
}
maxusers = *Maxusers;
maxusers = (maxusers ? maxusers : SERVERMAXUSERS);
if (port <= 0 && usockfile == NULL)
- throw(IO, "mal_mapi.listen", OPERATION_FAILED " No port or
socket file specified");
+ throw(IO, "mal_mapi.listen", OPERATION_FAILED ": no port or
socket file specified");
if (port > 0) {
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock == INVALID_SOCKET)
throw(IO, "mal_mapi.listen",
- OPERATION_FAILED " Creation of stream
socket failed: %s",
+ OPERATION_FAILED ": creation of stream
socket failed: %s",
strerror(errno));
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *) &on, sizeof
on);
@@ -728,7 +728,7 @@
if (getsockname(sock, (SOCKPTR) &server, &length) < 0)
throw(IO, "mal_mapi.listen",
- OPERATION_FAILED " Failed getting
socket name: %s",
+ OPERATION_FAILED ": failed getting
socket name: %s",
strerror(errno));
listen(sock, maxusers);
}
@@ -737,7 +737,7 @@
usock = socket(AF_UNIX, SOCK_STREAM, 0);
if (usock == INVALID_SOCKET ) {
throw(IO, "mal_mapi.listen",
- OPERATION_FAILED " Creation of Unix
socket failed: %s",
+ OPERATION_FAILED ": creation of UNIX
socket failed: %s",
strerror(errno));
}
userver.sun_family = AF_UNIX;
@@ -748,7 +748,7 @@
if (bind(usock, (SOCKPTR) & userver, length) < 0) {
unlink(usockfile);
throw(IO, "mal_mapi.listen",
- OPERATION_FAILED " Binding to Unix
socket file %s failed: %s",
+ OPERATION_FAILED ": binding to UNIX
socket file %s failed: %s",
usockfile, strerror(errno));
}
listen(usock, maxusers);
@@ -771,7 +771,7 @@
psock[2] = INVALID_SOCKET;
if (MT_create_thread(pidp, (void (*)(void *)) SERVERlistenThread,
psock) < 0) {
GDKfree(psock);
- throw(MAL, "mal_mapi.listen", OPERATION_FAILED " Starting
thread failed");
+ throw(MAL, "mal_mapi.listen", OPERATION_FAILED ": starting
thread failed");
}
#ifdef DEBUG_SERVER
gethostname(host, (int) 512);
@@ -936,7 +936,7 @@
l--;
}
*f=0;
- throw(MAL, "@1", OPERATION_FAILED " Remote error: %s", newerr);
+ throw(MAL, "@1", OPERATION_FAILED ": remote error: %s", newerr);
}
}
@c
@@ -965,7 +965,7 @@
if( i==MAXSESSIONS){
mal_unset_lock(mal_contextLock,"SERVERconnect");
- throw(IO, "mapi.connect", OPERATION_FAILED " Too many
sessions");
+ throw(IO, "mapi.connect", OPERATION_FAILED ": too many
sessions");
}
SERVERsessions[i].c= cntxt;
SERVERsessions[i].key= ++sessionkey;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
