Changeset: 88e3cd39dc7b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=88e3cd39dc7b
Modified Files:
buildtools/Mx/Def.c
buildtools/Mx/Io.c
buildtools/Mx/disclaimer.c
clients/mapiclient/dump.c
clients/mapilib/mapi.c
clients/odbc/driver/ODBCConvert.c
common/stream/stream.c
configure.ag
gdk/gdk_bbp.mx
gdk/gdk_heap.mx
gdk/gdk_logger.mx
gdk/gdk_rangejoin.mx
gdk/gdk_setop.mx
gdk/gdk_ssort.mx
monetdb5/extras/crackers/crackers_core_unordered.mx
monetdb5/extras/crackers/crackers_index.mx
monetdb5/extras/crackers/crackers_joins.mx
monetdb5/extras/crackers/crackers_partial_sideways.mx
monetdb5/extras/crackers/crackers_pq.mx
monetdb5/extras/crackers/crackers_sideways.mx
monetdb5/extras/crackers/crackers_sortmerge.mx
monetdb5/extras/crackers/crackers_updates.mx
monetdb5/extras/sphinx/sphinx.mx
monetdb5/mal/mal_authorize.mx
monetdb5/mal/mal_debugger.mx
monetdb5/mal/mal_instruction.mx
monetdb5/mal/mal_interpreter.mx
monetdb5/mal/mal_linker.mx
monetdb5/mal/mal_namespace.mx
monetdb5/mal/mal_parser.mx
monetdb5/mal/mal_profiler.mx
monetdb5/mal/mal_readline.mx
monetdb5/misc/msabaoth.c
monetdb5/modules/atoms/batxml.mx
monetdb5/modules/atoms/mtime.mx
monetdb5/modules/atoms/streams.mx
monetdb5/modules/atoms/url.mx
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/array.mx
monetdb5/modules/kernel/batcalc.mx
monetdb5/modules/kernel/batcast.mx
monetdb5/modules/kernel/batmtime.mx
monetdb5/modules/mal/bbp.mx
monetdb5/modules/mal/bpm.mx
monetdb5/modules/mal/cluster.mx
monetdb5/modules/mal/histogram.mx
monetdb5/modules/mal/mal_mapi.mx
monetdb5/modules/mal/tablet.mx
monetdb5/modules/mal/zorder.mx
monetdb5/optimizer/opt_cluster.mx
monetdb5/optimizer/opt_coercion.mx
monetdb5/optimizer/opt_constants.mx
monetdb5/optimizer/opt_costModel.mx
monetdb5/optimizer/opt_garbageCollector.mx
monetdb5/optimizer/opt_history.mx
monetdb5/optimizer/opt_joinpath.mx
monetdb5/optimizer/opt_mapreduce.mx
monetdb5/optimizer/opt_mergetable.mx
monetdb5/optimizer/opt_sidcrack.mx
monetdb5/optimizer/opt_support.mx
monetdb5/scheduler/run_memo.mx
sql/common/sql_list.c
sql/common/sql_types.c
Branch: Apr2011
Log Message:
Backed out changeset 987597097daf
It seems it breaks everywhere
diffs (truncated from 3973 to 300 lines):
diff --git a/buildtools/Mx/Def.c b/buildtools/Mx/Def.c
--- a/buildtools/Mx/Def.c
+++ b/buildtools/Mx/Def.c
@@ -85,11 +85,11 @@
void
InitDef(void)
{
- time_t myclock;
+ time_t clock;
mx_title = 0;
- time(&myclock);
- mx_date = ctime(&myclock);
+ time(&clock);
+ mx_date = ctime(&clock);
mx_author = "";
mx_version = "";
pushCond(1, "");
diff --git a/buildtools/Mx/Io.c b/buildtools/Mx/Io.c
--- a/buildtools/Mx/Io.c
+++ b/buildtools/Mx/Io.c
@@ -188,7 +188,7 @@
}
FILE *
-fmustopen(char *fname, char *fmode)
+fmustopen(char *fname, char *mode)
{
char *p;
struct stat buf;
@@ -210,7 +210,7 @@
*p = DIR_SEP;
}
}
- return fopen(fname, fmode);
+ return fopen(fname, mode);
}
diff --git a/buildtools/Mx/disclaimer.c b/buildtools/Mx/disclaimer.c
--- a/buildtools/Mx/disclaimer.c
+++ b/buildtools/Mx/disclaimer.c
@@ -32,15 +32,15 @@
static const char defaultfile[] = "license.txt";
static FILE *
-openDisclaimerFile(const char *fname)
+openDisclaimerFile(const char *filename)
{
FILE *fp = NULL;
- if (!fname || strlen(fname) < 1)
- fname = defaultfile;
+ if (!filename || strlen(filename) < 1)
+ filename = defaultfile;
- if (*fname == DIR_SEP) {
- fp = fopen(fname, "r");
+ if (*filename == DIR_SEP) {
+ fp = fopen(filename, "r");
} else {
char buf[8096];
size_t len;
@@ -57,7 +57,7 @@
}
/* search backwards, such that we can find the license.txt
* file in the root of each module */
- strncat(buf, fname, 8095 - len);
+ strncat(buf, filename, 8095 - len);
while (len > 0 && (fp = fopen(buf, "r")) == 0) {
/* remove last path */
len--; /* the trailing slash */
@@ -67,7 +67,7 @@
break;
}
}
- strncat(buf, fname, 8096 - len - 1);
+ strncat(buf, filename, 8096 - len - 1);
}
}
@@ -77,14 +77,14 @@
}
static void
-writeDisclaimer(FILE *fp, const char *comment_start, const char *prefix, const
char *comment_end, const char *fname)
+writeDisclaimer(FILE *fp, const char *comment_start, const char *prefix, const
char *comment_end, const char *filename)
{
FILE *dfile;
char line[DISC_WIDTH + 2];
size_t prefixLength = strlen(prefix), i, ret;
- dfile = openDisclaimerFile(fname);
+ dfile = openDisclaimerFile(filename);
if (!dfile)
return;
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -923,7 +923,7 @@
goto bailout;
while (mapi_fetch_row(hdl) != 0) {
- char *sschema = mapi_fetch_field(hdl, 0);
+ char *schema = mapi_fetch_field(hdl, 0);
char *name = mapi_fetch_field(hdl, 1);
char *start = mapi_fetch_field(hdl, 2);
char *minvalue = mapi_fetch_field(hdl, 3);
@@ -933,7 +933,7 @@
mnstr_printf(toConsole,
"CREATE SEQUENCE \"%s\".\"%s\" START WITH %s",
- sschema, name, start);
+ schema, name, start);
if (strcmp(increment, "1") != 0)
mnstr_printf(toConsole, " INCREMENT BY %s", increment);
if (strcmp(minvalue, "0") != 0)
@@ -998,10 +998,10 @@
}
while (mapi_fetch_row(hdl) != 0) {
- char *schem = mapi_fetch_field(hdl, 0);
+ char *sname = mapi_fetch_field(hdl, 0);
char *aname = mapi_fetch_field(hdl, 1);
- mnstr_printf(toConsole, "CREATE SCHEMA \"%s\"", schem);
+ mnstr_printf(toConsole, "CREATE SCHEMA \"%s\"", sname);
if (strcmp(aname, "sysadmin") != 0) {
mnstr_printf(toConsole,
" AUTHORIZATION \"%s\"", aname);
@@ -1598,14 +1598,14 @@
char *uname = mapi_fetch_field(hdl, 0);
char *fullname = mapi_fetch_field(hdl, 1);
char *pwhash = mapi_fetch_field(hdl, 2);
- char *schem = mapi_fetch_field(hdl, 3);
+ char *sname = mapi_fetch_field(hdl, 3);
mnstr_printf(toConsole, "CREATE USER \"%s\"", uname);
if (describe)
mnstr_printf(toConsole,
" WITH ENCRYPTED PASSWORD '%s'"
" NAME '%s' SCHEMA \"%s\";\n",
- pwhash, fullname, schem);
+ pwhash, fullname, sname);
else
mnstr_printf(toConsole,
" WITH ENCRYPTED PASSWORD '%s'"
@@ -1622,10 +1622,10 @@
goto bailout;
while (mapi_fetch_row(hdl) != 0) {
- char *schem = mapi_fetch_field(hdl, 0);
+ char *sname = mapi_fetch_field(hdl, 0);
char *aname = mapi_fetch_field(hdl, 1);
- mnstr_printf(toConsole, "CREATE SCHEMA \"%s\"", schem);
+ mnstr_printf(toConsole, "CREATE SCHEMA \"%s\"", sname);
if (strcmp(aname, "sysadmin") != 0) {
mnstr_printf(toConsole,
" AUTHORIZATION \"%s\"", aname);
@@ -1644,14 +1644,14 @@
while (mapi_fetch_row(hdl) != 0) {
char *uname = mapi_fetch_field(hdl, 0);
- char *schem = mapi_fetch_field(hdl, 3);
+ char *sname = mapi_fetch_field(hdl, 3);
- if (strcmp(schem, "sys") == 0)
+ if (strcmp(sname, "sys") == 0)
continue;
mnstr_printf(toConsole,
"ALTER USER \"%s\" "
"SET SCHEMA \"%s\";\n",
- uname, schem);
+ uname, sname);
}
if (mapi_error(mid))
goto bailout;
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1761,7 +1761,7 @@
mapi_new(void)
{
Mapi mid;
- static int mapi_next_index = 0;
+ static int index = 0;
mid = malloc(sizeof(*mid));
if (mid == NULL)
@@ -1772,7 +1772,7 @@
memset(mid, 0, sizeof(*mid));
/* then fill in some details */
- mid->index = mapi_next_index++; /* for distinctions in log records */
+ mid->index = index++; /* for distinctions in log records */
mid->auto_commit = 1;
mid->error = MOK;
mid->hostname = strdup("localhost");
@@ -2485,6 +2485,7 @@
unsigned char md[64]; /* should be
SHA512_DIGEST_LENGTH */
size_t n = strlen(mid->password);
char *key = alloca(n);
+ int len;
strncpy(key, mid->password, n);
@@ -3396,6 +3397,8 @@
ssize_t len;
if (mid->blk.lim - mid->blk.end < BLOCK) {
+ int len;
+
len = mid->blk.lim;
if (mid->blk.nxt <= BLOCK) {
/* extend space */
diff --git a/clients/odbc/driver/ODBCConvert.c
b/clients/odbc/driver/ODBCConvert.c
--- a/clients/odbc/driver/ODBCConvert.c
+++ b/clients/odbc/driver/ODBCConvert.c
@@ -1199,7 +1199,7 @@
case SQL_BINARY:
case SQL_VARBINARY:
case SQL_LONGVARBINARY: {
- size_t l;
+ size_t i;
int n;
unsigned char c = 0;
SQLLEN j = 0;
@@ -1214,13 +1214,13 @@
#endif
return SQL_ERROR;
}
- for (l = 0; l < datalen; l++) {
- if ('0' <= data[l] && data[l] <= '9')
- n = data[l] - '0';
- else if ('A' <= data[l] && data[l] <= 'F')
- n = data[l] - 'A' + 10;
- else if ('a' <= data[l] && data[l] <= 'f')
- n = data[l] - 'a' + 10;
+ for (i = 0; i < datalen; i++) {
+ if ('0' <= data[i] && data[i] <= '9')
+ n = data[i] - '0';
+ else if ('A' <= data[i] && data[i] <= 'F')
+ n = data[i] - 'A' + 10;
+ else if ('a' <= data[i] && data[i] <= 'f')
+ n = data[i] - 'a' + 10;
else {
/* should not happen */
/* General error */
@@ -1231,7 +1231,7 @@
#endif
return SQL_ERROR;
}
- if (l & 1) {
+ if (i & 1) {
c |= n;
if (j < buflen)
p[j] = c;
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1138,7 +1138,7 @@
/* this function is called by libcurl when there is data for us */
static size_t
-write_callback(char *cbuffer, size_t size, size_t nitems, void *userp)
+write_callback(char *buffer, size_t size, size_t nitems, void *userp)
{
stream *s = (stream *) userp;
struct curl_data *c = (struct curl_data *) s->stream_data.p;
@@ -1167,7 +1167,7 @@
c->buffer = realloc(c->buffer, c->usesize + size);
}
/* finally, store the data we received */
- memcpy(c->buffer + c->usesize, cbuffer, size);
+ memcpy(c->buffer + c->usesize, buffer, size);
c->usesize += size;
return size;
}
@@ -1666,7 +1666,7 @@
}
int
-udp_socket(udp_stream * udp, char *hostname, int port, int swrite)
+udp_socket(udp_stream * udp, char *hostname, int port, int write)
{
struct sockaddr *serv;
socklen_t servsize;
@@ -1677,7 +1677,7 @@
return 0;
memset(&udp->addr, 0, sizeof(udp->addr));
- if (swrite)
+ if (write)
memcpy(&udp->addr.sin_addr, hp->h_addr_list[0], hp->h_length);
else
udp->addr.sin_addr.s_addr = INADDR_ANY;
@@ -1688,7 +1688,7 @@
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
