Changeset: 0a24bc154be0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0a24bc154be0
Modified Files:
MonetDB/src/gdk/gdk.mx
MonetDB/src/gdk/gdk_posix.mx
geom/NT/rules.msc
sql/src/server/sql_parser.mx
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (truncated from 518 to 300 lines):
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB/src/common/monet_options.mx
--- a/MonetDB/src/common/monet_options.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB/src/common/monet_options.mx Fri Jul 23 18:10:40 2010 +0200
@@ -274,7 +274,7 @@
char *s, *t, *val;
int quote;
- for (s = buf; *s && isspace((int) (*s)); s++)
+ for (s = buf; *s && isspace((int) (unsigned char) *s); s++)
;
if (*s == '#')
continue; /* commentary */
@@ -289,12 +289,12 @@
}
*val = 0;
- for (t = s; *t && !isspace((int) (*t)); t++)
+ for (t = s; *t && !isspace((int) (unsigned char) *t); t++)
;
*t = 0;
/* skip any leading blanks in the value part */
- for (val++; *val && isspace((int) (*val)); val++)
+ for (val++; *val && isspace((int) (unsigned char) *val); val++)
;
/* search to unquoted # */
@@ -311,7 +311,7 @@
exit(1);
}
/* remove trailing white space */
- while (isspace((int) (t[-1])))
+ while (isspace((int) (unsigned char) t[-1]))
t--;
*t++ = 0;
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB/src/common/stream.mx
--- a/MonetDB/src/common/stream.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB/src/common/stream.mx Fri Jul 23 18:10:40 2010 +0200
@@ -380,16 +380,10 @@
#ifdef NATIVE_WIN32
{
- int sockopt = SO_SYNCHRONOUS_NONALERT;
WSADATA w;
if (WSAStartup(0x0101, &w) != 0)
return -1;
-
- if (setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, (void
*) &sockopt, sizeof(sockopt)) < 0) {
- WSACleanup();
- return -1;
- }
}
#endif
inited = 1;
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB/src/gdk/gdk.mx
--- a/MonetDB/src/gdk/gdk.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB/src/gdk/gdk.mx Fri Jul 23 18:10:40 2010 +0200
@@ -417,10 +417,10 @@
#define MIN(A,B) ((A)>(B)?(B):(A))
/* defines from ctype with casts that allow passing char values */
-#define GDKisprint(c) isprint((int) ((unsigned char) (c)))
-#define GDKisspace(c) isspace((int) ((unsigned char) (c)))
-#define GDKisalnum(c) isalnum((int) ((unsigned char) (c)))
-#define GDKisgraph(c) isgraph((int) ((unsigned char) (c)))
+#define GDKisprint(c) isprint((int) (unsigned char) (c))
+#define GDKisspace(c) isspace((int) (unsigned char) (c))
+#define GDKisalnum(c) isalnum((int) (unsigned char) (c))
+#define GDKisgraph(c) isgraph((int) (unsigned char) (c))
#define GDKisdigit(c) (((unsigned char) (c)) >= '0' && ((unsigned char) (c))
<= '9')
#define GDKisxcntrl(c) (((unsigned char) (c)) >= 128 && ((unsigned char) (c))
<= 160)
#define GDKisspecial(c) (((unsigned char) (c)) >= 161 && ((unsigned char) (c))
<= 191)
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB/src/gdk/gdk_posix.mx
--- a/MonetDB/src/gdk/gdk_posix.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB/src/gdk/gdk_posix.mx Fri Jul 23 18:10:40 2010 +0200
@@ -1731,7 +1731,7 @@
if (base)
return base + 1;
- if (isalpha(file_name[0]) && file_name[1] == ':')
+ if (isalpha((int) (unsigned char) file_name[0]) && file_name[1] == ':')
return (char *) file_name + 2;
return (char *) file_name;
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB4/src/mapi/mapi.mx
--- a/MonetDB4/src/mapi/mapi.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB4/src/mapi/mapi.mx Fri Jul 23 18:10:40 2010 +0200
@@ -747,7 +747,7 @@
#ifdef HAVE_SYS_UN_H
struct sockaddr_un userver;
- SOCKET usock = -1;
+ SOCKET usock = INVALID_SOCKET;
#endif
char *usockfile;
socklen_t length = 0;
@@ -859,7 +859,7 @@
if (sock != INVALID_SOCKET)
FD_SET(sock, &fds);
#ifdef HAVE_SYS_UN_H
- if (usock >= 0)
+ if (usock != INVALID_SOCKET)
FD_SET(usock, &fds);
#endif
/* Wait up to 2 seconds. */
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB4/src/modules/contrib/txtsim.mx
--- a/MonetDB4/src/modules/contrib/txtsim.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB4/src/modules/contrib/txtsim.mx Fri Jul 23 18:10:40 2010 +0200
@@ -275,7 +275,7 @@
/* keep first letter */
Key[0] = *Name;
- if (!isupper((int) (Key[0])))
+ if (!isupper((int) (unsigned char) Key[0]))
Key[0] = toupper(Key[0]);
LastLetter = *Name;
@@ -286,7 +286,7 @@
/* scan rest of string */
for (Index = 1; (Index <SoundexLen) &&*Name; Name++) {
/* use only letters */
- if (isalpha((int) (*Name))) {
+ if (isalpha((int) (unsigned char) *Name)) {
/* ignore duplicate successive chars */
if (LastLetter != *Name) {
/* new LastLetter */
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB4/src/modules/plain/monettime.mx
--- a/MonetDB4/src/modules/plain/monettime.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB4/src/modules/plain/monettime.mx Fri Jul 23 18:10:40 2010 +0200
@@ -1957,7 +1957,8 @@
v = v * 10 + (*snew) - '0';
snew++;
}
- } else if (isupper((int) (*snew)) || islower((int) (*snew))) {
+ } else if (isupper((int) (unsigned char) *snew) ||
+ islower((int) (unsigned char) *snew)) {
switch (*snew++) {
case 'y':
case 'Y':
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB4/src/modules/plain/tcpip.mx
--- a/MonetDB4/src/modules/plain/tcpip.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB4/src/modules/plain/tcpip.mx Fri Jul 23 18:10:40 2010 +0200
@@ -1222,7 +1222,7 @@
TCPlisten(int *port)
{
struct sockaddr_in server, client;
- SOCKET msgsock = -1;
+ SOCKET msgsock = INVALID_SOCKET;
SOCKET sock = socket(AF_INET, SOCK_STREAM, 0);
int port_no = 0, i, on = 1;
SOCKLEN server_len = (SOCKLEN) sizeof(server);
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB4/src/modules/plain/url.mx
--- a/MonetDB4/src/modules/plain/url.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB4/src/modules/plain/url.mx Fri Jul 23 18:10:40 2010 +0200
@@ -660,12 +660,12 @@
static int
needEscape(char c)
{
- if( isalnum((int)c) )
- return 0;
- if( c == '#' || c == '-' || c == '_' || c == '.' || c == '!' ||
- c == '~' || c == '*' || c == '\'' || c == '(' || c == ')' )
- return 0;
- return 1;
+ if (isalnum((int) (unsigned char) c))
+ return 0;
+ if (c == '#' || c == '-' || c == '_' || c == '.' || c == '!' ||
+ c == '~' || c == '*' || c == '\'' || c == '(' || c == ')')
+ return 0;
+ return 1;
}
/* COMMAND "escape": this function applies the URI escaping rules defined in
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB4/src/monet/monet_client.mx
--- a/MonetDB4/src/monet/monet_client.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB4/src/monet/monet_client.mx Fri Jul 23 18:10:40 2010 +0200
@@ -648,7 +648,8 @@
* only handle ASCII, so check for
* non-ASCII-ness separately */
if (!incomment &&
- ((*s & ~0x7F) != 0 || !isspace((int) *s)))
+ ((*s & ~0x7F) != 0 ||
+ !isspace((int) (unsigned char) *s)))
doflush = 0;
escaped = 0;
*p++ = *s;
diff -r 22d72d45a13a -r 0a24bc154be0 MonetDB5/src/modules/mal/mal_mapi.mx
--- a/MonetDB5/src/modules/mal/mal_mapi.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/MonetDB5/src/modules/mal/mal_mapi.mx Fri Jul 23 18:10:40 2010 +0200
@@ -554,7 +554,7 @@
rv = recvmsg(msgsock, &msgh, 0);
if (rv == -1) {
- close(msgsock);
+ closesocket(msgsock);
continue;
}
@@ -566,18 +566,18 @@
/* filedescriptor, put it in place of
msgsock */
cmsg = CMSG_FIRSTHDR(&msgh);
if (!cmsg->cmsg_type == SCM_RIGHTS) {
- close(msgsock);
+ closesocket(msgsock);
fprintf(stderr,
"!mal_mapi.listen: "
"expected
filedescriptor, but "
"received
something else\n");
continue;
}
- close(msgsock);
+ closesocket(msgsock);
msgsock = *(int*)CMSG_DATA(cmsg);
break;
default:
/* some unknown state */
- close(msgsock);
+ closesocket(msgsock);
fprintf(stderr, "!mal_mapi.listen: "
"unknown command type
in first byte\n");
continue;
diff -r 22d72d45a13a -r 0a24bc154be0 clients/src/mapilib/Mapi.mx
--- a/clients/src/mapilib/Mapi.mx Fri Jul 23 17:02:10 2010 +0200
+++ b/clients/src/mapilib/Mapi.mx Fri Jul 23 18:10:40 2010 +0200
@@ -2385,7 +2385,7 @@
msg.msg_flags = 0;
if (sendmsg(s, &msg, 0) < 0) {
- close(s);
+ closesocket(s);
snprintf(errbuf, sizeof(errbuf), "could not send
initial byte: %s", strerror(errno));
return mapi_setError(mid, errbuf, "mapi_reconnect",
MERROR);
}
@@ -2416,7 +2416,7 @@
continue;
if (connect(s, rp->ai_addr, rp->ai_addrlen) != -1)
break; /* success */
- close(s);
+ closesocket(s);
}
freeaddrinfo(res);
if (rp == NULL)
@@ -5086,7 +5086,7 @@
unsigned int fac = 1000000000;
unsigned int nsec = 0;
- for (n++; isdigit((int) val[n]); n++) {
+ for (n++; isdigit((int) (unsigned char) val[n]); n++) {
fac /= 10;
nsec += (val[n] - '0') * fac;
}
diff -r 22d72d45a13a -r 0a24bc154be0 geom/NT/rules.msc
--- a/geom/NT/rules.msc Fri Jul 23 17:02:10 2010 +0200
+++ b/geom/NT/rules.msc Fri Jul 23 18:10:40 2010 +0200
@@ -35,9 +35,15 @@
pkg = geom
CONFIG_H=geom_config.h
-GEOS = C:\geos-3.0.win$(bits)
-GEOS_LIBS = $(GEOS)\lib\geos_c_i$(DEBUGLIB).lib
-GEOS_INCS = -I$(GEOS)\include
+!IFNDEF LIBGEOS
+LIBGEOS = C:\geos-3.0.win$(bits)
+!ENDIF
+!IFDEF DEBUG
+GEOS_LIBS = $(LIBGEOS)\lib\geos_c_i$(GEOSDEBUGLIB).lib
+!ELSE
+GEOS_LIBS = $(LIBGEOS)\lib\geos_c_i.lib
+!ENDIF
+GEOS_INCS = -I$(LIBGEOS)\include
MONETDB_INCLUDEDIR=$(MONETDB_PREFIX)\include\MonetDB
diff -r 22d72d45a13a -r 0a24bc154be0 pathfinder/runtime/shttpd.c
--- a/pathfinder/runtime/shttpd.c Fri Jul 23 17:02:10 2010 +0200
+++ b/pathfinder/runtime/shttpd.c Fri Jul 23 18:10:40 2010 +0200
@@ -3121,11 +3121,7 @@
/* Initialize winsock library */
{
WSADATA data;
- int opt = SO_SYNCHRONOUS_NONALERT;
WSAStartup(MAKEWORD(2,2), &data);
- if (setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
- (void *)&opt,sizeof(opt)) < 0)
- elog(ERR_FATAL, "setsockopt: %d", ERRNO);
}
#endif /* _WIN32 */
diff -r 22d72d45a13a -r 0a24bc154be0 pathfinder/runtime/shttpd.h
--- a/pathfinder/runtime/shttpd.h Fri Jul 23 17:02:10 2010 +0200
+++ b/pathfinder/runtime/shttpd.h Fri Jul 23 18:10:40 2010 +0200
@@ -57,7 +57,7 @@
* this structure keeps all per-socket global information.
*/
typedef struct {
- int sock;
+ SOCKET sock;
unsigned int nrequests; /* Requests made */
unsigned int kb_in, kb_out; /* IN/OUT traffic counters */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
