Changeset: fd2185f49e16 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd2185f49e16
Modified Files:
clients/Tests/exports.stable.out
clients/odbc/driver/ODBCConvert.c
common/stream/stream.c
common/stream/stream.h
sql/backends/monet5/vaults/bam/bam_wrapper.c
sql/backends/monet5/vaults/lidar/lidar.c
sql/server/rel_optimizer.c
Branch: default
Log Message:
Use int8_t in mnstr_{read,write}Bte{,Array} and a few more places.
The Intel compiler on Linux complains otherwise that char and signed
char are different (even though char is signed there).
diffs (167 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -2645,8 +2645,8 @@ int mnstr_isalive(stream *s);
char *mnstr_name(stream *s);
int mnstr_printf(stream *restrict s, _In_z_ _Printf_format_string_ const char
*restrict format, ...) __attribute__((__format__(__printf__, 2, 3)));
ssize_t mnstr_read(stream *restrict s, void *restrict buf, size_t elmsize,
size_t cnt);
-int mnstr_readBte(stream *restrict s, signed char *restrict val);
-int mnstr_readBteArray(stream *restrict s, signed char *restrict val, size_t
cnt);
+int mnstr_readBte(stream *restrict s, int8_t *restrict val);
+int mnstr_readBteArray(stream *restrict s, int8_t *restrict val, size_t cnt);
int mnstr_readChr(stream *restrict s, char *restrict val);
int mnstr_readHge(stream *restrict s, hge *restrict val);
int mnstr_readHgeArray(stream *restrict s, hge *restrict val, size_t cnt);
@@ -2663,8 +2663,8 @@ void mnstr_set_byteorder(stream *s, char
void mnstr_settimeout(stream *s, unsigned int ms, int( *func)(void));
int mnstr_type(stream *s);
ssize_t mnstr_write(stream *restrict s, const void *restrict buf, size_t
elmsize, size_t cnt);
-int mnstr_writeBte(stream *s, signed char val);
-int mnstr_writeBteArray(stream *restrict s, const signed char *restrict val,
size_t cnt);
+int mnstr_writeBte(stream *s, int8_t val);
+int mnstr_writeBteArray(stream *restrict s, const int8_t *restrict val, size_t
cnt);
int mnstr_writeChr(stream *s, char val);
int mnstr_writeDbl(stream *s, double val);
int mnstr_writeFlt(stream *s, float val);
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
@@ -23,12 +23,12 @@
#define space(c) ((c) == ' ' || (c) == '\t')
typedef struct {
- unsigned char precision; /* total number of digits */
- signed char scale; /* how far to shift decimal point (>
+ uint8_t precision; /* total number of digits */
+ int8_t scale; /* how far to shift decimal point (>
* 0: shift left, i.e. number has
* fraction; < 0: shift right,
* i.e. multiply with power of 10) */
- unsigned char sign; /* 1 pos, 0 neg */
+ uint8_t sign; /* 1 pos, 0 neg */
uint64_t val; /* the value */
} bignum_t;
@@ -2959,8 +2959,8 @@ ODBCStore(ODBCStmt *stmt,
nval.val = * (SQLUBIGINT *) ptr;
break;
case SQL_C_NUMERIC:
- nval.precision = (unsigned char) apdrec->sql_desc_precision;
- nval.scale = (signed char) apdrec->sql_desc_scale;
+ nval.precision = (uint8_t) apdrec->sql_desc_precision;
+ nval.scale = (int8_t) apdrec->sql_desc_scale;
nval.sign = ((SQL_NUMERIC_STRUCT *) ptr)->sign;
nval.val = 0;
for (i = 0; i < SQL_MAX_NUMERIC_LEN; i++)
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -4471,7 +4471,7 @@ mnstr_writeChr(stream *s, char val)
}
int
-mnstr_readBte(stream *restrict s, signed char *restrict val)
+mnstr_readBte(stream *restrict s, int8_t *restrict val)
{
if (s == NULL || val == NULL)
return -1;
@@ -4479,7 +4479,7 @@ mnstr_readBte(stream *restrict s, signed
}
int
-mnstr_writeBte(stream *s, signed char val)
+mnstr_writeBte(stream *s, int8_t val)
{
if (s == NULL || s->errnr)
return 0;
@@ -4632,7 +4632,7 @@ mnstr_writeHge(stream *s, hge val)
#endif
int
-mnstr_readBteArray(stream *restrict s, signed char *restrict val, size_t cnt)
+mnstr_readBteArray(stream *restrict s, int8_t *restrict val, size_t cnt)
{
if (s == NULL || val == NULL)
return 0;
@@ -4647,7 +4647,7 @@ mnstr_readBteArray(stream *restrict s, s
}
int
-mnstr_writeBteArray(stream *restrict s, const signed char *restrict val,
size_t cnt)
+mnstr_writeBteArray(stream *restrict s, const int8_t *restrict val, size_t cnt)
{
if (s == NULL || s->errnr || val == NULL)
return 0;
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -102,11 +102,11 @@ stream_export int mnstr_init(void);
* 0 on error
* !0 on success
*/
-stream_export int mnstr_readBte(stream *restrict s, signed char *restrict val);
+stream_export int mnstr_readBte(stream *restrict s, int8_t *restrict val);
stream_export int mnstr_readChr(stream *restrict s, char *restrict val);
stream_export int mnstr_writeChr(stream *s, char val);
-stream_export int mnstr_writeBte(stream *s, signed char val);
+stream_export int mnstr_writeBte(stream *s, int8_t val);
stream_export int mnstr_readSht(stream *restrict s, short *restrict val);
stream_export int mnstr_writeSht(stream *s, short val);
stream_export int mnstr_readInt(stream *restrict s, int *restrict val);
@@ -123,8 +123,8 @@ stream_export int mnstr_readHge(stream *
stream_export int mnstr_writeHge(stream *s, hge val);
#endif
-stream_export int mnstr_readBteArray(stream *restrict s, signed char *restrict
val, size_t cnt);
-stream_export int mnstr_writeBteArray(stream *restrict s, const signed char
*restrict val, size_t cnt);
+stream_export int mnstr_readBteArray(stream *restrict s, int8_t *restrict val,
size_t cnt);
+stream_export int mnstr_writeBteArray(stream *restrict s, const int8_t
*restrict val, size_t cnt);
stream_export int mnstr_writeStr(stream *restrict s, const char *restrict val);
stream_export int mnstr_readStr(stream *restrict s, char *restrict val);
diff --git a/sql/backends/monet5/vaults/bam/bam_wrapper.c
b/sql/backends/monet5/vaults/bam/bam_wrapper.c
--- a/sql/backends/monet5/vaults/bam/bam_wrapper.c
+++ b/sql/backends/monet5/vaults/bam/bam_wrapper.c
@@ -687,7 +687,7 @@ clear_bam_header_line(bam_header_line *
/**
* Macros for appending data to the streams, evaluate to 0 on failure
*/
-#define APPEND_STR(strm, s) (mnstr_writeBteArray(strm, (signed char*)s,
strlen(s)) && mnstr_writeBte(strm, '\n'))
+#define APPEND_STR(strm, s) (mnstr_writeBteArray(strm, (int8_t*)s, strlen(s))
&& mnstr_writeBte(strm, '\n'))
#define APPEND_SHT(strm, i) mnstr_writeSht(strm, i)
#define APPEND_INT(strm, i) mnstr_writeInt(strm, i)
#define APPEND_LNG(strm, i) mnstr_writeLng(strm, i)
@@ -1468,7 +1468,7 @@ typedef bit (*buffer_check)(alignment *,
static inline int
next_alignment_field(stream * input, alignment * a,
str buffer, buffer_check bc, bit delim_tab, bit * eol, bit * eof) {
- signed char c;
+ int8_t c;
int index = 0;
if (mnstr_readBte(input, &c) == 0) {
*eof = TRUE;
diff --git a/sql/backends/monet5/vaults/lidar/lidar.c
b/sql/backends/monet5/vaults/lidar/lidar.c
--- a/sql/backends/monet5/vaults/lidar/lidar.c
+++ b/sql/backends/monet5/vaults/lidar/lidar.c
@@ -1003,7 +1003,7 @@ str LIDARloadTable(Client cntxt, MalBlkP
double t = LASPoint_GetTime(p);
char anglerank = LASPoint_GetScanAngleRank (p);
unsigned short sourceid = LASPoint_GetPointSourceId (p);
- fprintf(stderr,
+ fprintf(stderr,
"(point # %d)"
"X (raw) : %f (%ld)\n"
"Z (raw) : %f (%ld)\n"
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -4880,7 +4880,7 @@ rel_reduce_groupby_exps(int *changes, mv
if (is_groupby(rel->op) && rel->r && !rel_is_ref(rel)) {
node *n, *m;
- signed char *scores = malloc(list_length(gbe));
+ int8_t *scores = malloc(list_length(gbe));
int k, j, i;
sql_column *c;
sql_table **tbls;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
