Changeset: caa078247501 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=caa078247501
Modified Files:
MonetDB/src/common/stream.mx
MonetDB5/src/mal/mal_import.mx
clients/src/mapilib/tests/mapi_structs.py
Branch: default
Log Message:
Rename a bunch of constants that conflict with external code.
diffs (truncated from 722 to 300 lines):
diff -r bcf7f1590236 -r caa078247501 MonetDB/src/common/stream.mx
--- a/MonetDB/src/common/stream.mx Wed Nov 17 12:57:41 2010 +0100
+++ b/MonetDB/src/common/stream.mx Wed Nov 17 18:16:37 2010 +0100
@@ -275,10 +275,10 @@
typedef enum mnstr_errors {
- NO__ERROR = 0,
- OPEN_ERROR,
- READ_ERROR,
- WRITE_ERROR
+ MNSTR_NO__ERROR = 0,
+ MNSTR_OPEN_ERROR,
+ MNSTR_READ_ERROR,
+ MNSTR_WRITE_ERROR
} mnstr_errors;
#endif /*_STREAM_H_*/
@@ -591,7 +591,7 @@
mnstr_errnr(stream *s)
{
if (s == 0)
- return READ_ERROR;
+ return MNSTR_READ_ERROR;
return s->errnr;
}
@@ -599,7 +599,7 @@
mnstr_clearerr(stream *s)
{
if (s != NULL)
- s->errnr = NO__ERROR;
+ s->errnr = MNSTR_NO__ERROR;
}
int
@@ -649,7 +649,7 @@
#endif
assert(s->access == ST_READ);
s->type = ST_BIN;
- if (s->errnr == NO__ERROR)
+ if (s->errnr == MNSTR_NO__ERROR)
s->read(s, (void *) &s->byteorder, sizeof(s->byteorder), 1);
return s;
}
@@ -662,7 +662,7 @@
#endif
assert(s->access == ST_WRITE);
s->type = ST_BIN;
- if (s->errnr == NO__ERROR)
+ if (s->errnr == MNSTR_NO__ERROR)
s->write(s, (void *) &s->byteorder, sizeof(s->byteorder), 1);
return s;
}
@@ -689,13 +689,13 @@
char buf[BUFSIZ];
switch (s->errnr) {
- case OPEN_ERROR:
+ case MNSTR_OPEN_ERROR:
snprintf(buf, BUFSIZ, "error could not open file %s\n",
s->name);
return strdup(buf);
- case READ_ERROR:
+ case MNSTR_READ_ERROR:
snprintf(buf, BUFSIZ, "error reading file %s\n", s->name);
return strdup(buf);
- case WRITE_ERROR:
+ case MNSTR_WRITE_ERROR:
snprintf(buf, BUFSIZ, "error writing file %s\n", s->name);
return strdup(buf);
}
@@ -714,7 +714,7 @@
s->type = ST_ASCII;
s->name = strdup(name);
s->stream_data.p = NULL;
- s->errnr = NO__ERROR;
+ s->errnr = MNSTR_NO__ERROR;
s->stream_data.p = NULL;
s->read = NULL;
s->readline = NULL;
@@ -744,7 +744,7 @@
if (!feof(fp)) {
rc = fread(buf, elmsize, cnt, fp);
if (ferror(fp))
- s->errnr = READ_ERROR;
+ s->errnr = MNSTR_READ_ERROR;
}
return (ssize_t) rc;
}
@@ -756,7 +756,7 @@
size_t rc = fwrite(buf, elmsize, cnt, (FILE *)
s->stream_data.p);
if (rc < cnt)
- s->errnr = WRITE_ERROR;
+ s->errnr = MNSTR_WRITE_ERROR;
return (ssize_t) rc;
}
return (ssize_t) cnt;
@@ -785,7 +785,7 @@
FILE *fp = (FILE *) s->stream_data.p;
if (s->access == ST_WRITE && fflush(fp) < 0) {
- s->errnr = WRITE_ERROR;
+ s->errnr = MNSTR_WRITE_ERROR;
return 1;
}
return 0;
@@ -810,7 +810,7 @@
#endif
#endif
) {
- s->errnr = WRITE_ERROR;
+ s->errnr = MNSTR_WRITE_ERROR;
return 1;
}
return 0;
@@ -874,7 +874,7 @@
if ((s = create_stream(filename)) == NULL)
return NULL;
if ((fp = fopen(filename, flags)) == NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
s->read = file_read;
s->readline = NULL;
s->write = file_write;
@@ -955,7 +955,7 @@
if ((s = create_stream(filename)) == NULL)
return NULL;
if ((fp = gzopen(filename, flags)) == NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
s->read = stream_gzread;
s->write = stream_gzwrite;
s->close = stream_gzclose;
@@ -972,10 +972,10 @@
if ((s = open_gzstream(filename, "rb")) == NULL)
return NULL;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR &&
+ if (s->errnr == MNSTR_NO__ERROR &&
gzread((gzFile *) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder)) < (int) sizeof(s->byteorder)) {
stream_gzclose(s);
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
}
return s;
}
@@ -989,7 +989,7 @@
return NULL;
s->access = ST_WRITE;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR)
+ if (s->errnr == MNSTR_NO__ERROR)
gzwrite((gzFile *) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder));
return s;
}
@@ -1082,7 +1082,7 @@
if ((s = create_stream(filename)) == NULL)
return NULL;
if ((fp = BZ2_bzopen(filename, flags)) == NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
s->read = stream_bzread;
s->write = stream_bzwrite;
s->close = stream_bzclose;
@@ -1099,10 +1099,10 @@
if ((s = open_bzstream(filename, "rb")) == NULL)
return NULL;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR &&
+ if (s->errnr == MNSTR_NO__ERROR &&
BZ2_bzread((BZFILE *) s->stream_data.p, (void *) &s->byteorder,
sizeof(s->byteorder)) < (int) sizeof(s->byteorder)) {
stream_bzclose(s);
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
}
return s;
}
@@ -1116,7 +1116,7 @@
return NULL;
s->access = ST_WRITE;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR)
+ if (s->errnr == MNSTR_NO__ERROR)
BZ2_bzwrite((BZFILE *) s->stream_data.p, (void *)
&s->byteorder, sizeof(s->byteorder));
return s;
}
@@ -1176,7 +1176,7 @@
return open_gzrstream(filename);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1185,19 +1185,19 @@
return open_bzrstream(filename);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
if ((s = open_stream(filename, "rb")) == NULL)
return NULL;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR) {
+ if (s->errnr == MNSTR_NO__ERROR) {
if (fread((void *) &s->byteorder, sizeof(s->byteorder), 1,
(FILE *) s->stream_data.p) < 1 ||
ferror((FILE *) s->stream_data.p)) {
fclose((FILE *) s->stream_data.p);
s->stream_data.p = NULL;
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
}
}
return s;
@@ -1219,7 +1219,7 @@
return open_gzwstream_(filename, mode);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1228,7 +1228,7 @@
return open_bzwstream_(filename, mode);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1236,9 +1236,9 @@
return NULL;
s->access = ST_WRITE;
s->type = ST_BIN;
- if (s->errnr == NO__ERROR &&
+ if (s->errnr == MNSTR_NO__ERROR &&
fwrite((void *) &s->byteorder, sizeof(s->byteorder), 1, (FILE *)
s->stream_data.p) < 1)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
}
@@ -1270,7 +1270,7 @@
return open_gzrastream(filename);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1279,7 +1279,7 @@
return open_bzrastream(filename);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1305,7 +1305,7 @@
return open_gzwastream_(filename, mode);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1314,7 +1314,7 @@
return open_bzwastream_(filename, mode);
#else
if ((s = create_stream(filename)) != NULL)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
return s;
#endif
}
@@ -1541,7 +1541,7 @@
}
#else
if (curl_easy_perform(c->handle) != CURLE_OK)
- s->errnr = OPEN_ERROR;
+ s->errnr = MNSTR_OPEN_ERROR;
curl_easy_cleanup(c->handle);
c->handle = NULL;
c->running = 0;
@@ -1581,12 +1581,12 @@
res += nr;
}
if (nr < 0) {
- s->errnr = WRITE_ERROR;
+ s->errnr = MNSTR_WRITE_ERROR;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
