Changeset: fab0fffa2152 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fab0fffa2152
Modified Files:
clients/mapiclient/mclient.c
gdk/gdk_logger.c
gdk/gdk_utils.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/xml.c
sql/backends/monet5/bam/bam_export.c
Branch: default
Log Message:
Merge with Jul2015 branch.
diffs (72 lines):
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -2916,7 +2916,7 @@ set_timezone(Mapi mid)
/* figure out our current timezone */
#ifdef HAVE__GET_TIMEZONE
- long tz;
+ long tz; /* type long required by _get_timezone() */
int dst;
_tzset();
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -1714,7 +1714,7 @@ logger_load(int debug, const char* fn, c
snprintf(bak, sizeof(bak), "%s_32-64-convert", fn);
{
FILE *fp1;
- long off;
+ long off; /* type long required by ftell() &
fseek() */
int curid;
/* read the current log id without disturbing
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -404,7 +404,7 @@ MT_init(void)
/* NetBSD, OpenBSD, Darwin, 32-bits; FreeBSD 32 & 64-bits */
{
# ifdef __FreeBSD__
- unsigned long size = 0;
+ unsigned long size = 0; /* type long required by sysctl() (?) */
# else
int size = 0;
# endif
diff --git a/monetdb5/modules/atoms/inet.c b/monetdb5/modules/atoms/inet.c
--- a/monetdb5/modules/atoms/inet.c
+++ b/monetdb5/modules/atoms/inet.c
@@ -104,7 +104,7 @@ int
INETfromString(const char *src, int *len, inet **retval)
{
int i, last, type;
- long parse;
+ long parse; /* type long returned by strtol() */
char *endptr;
char sep = '.';
diff --git a/monetdb5/modules/atoms/xml.c b/monetdb5/modules/atoms/xml.c
--- a/monetdb5/modules/atoms/xml.c
+++ b/monetdb5/modules/atoms/xml.c
@@ -111,7 +111,7 @@ XMLunquotestring(const char **p, char q,
} else if (*s == '#') {
char *e;
int base;
- unsigned long n;
+ unsigned long n; /* type unsigned long returned
by strtoul() */
s++;
if (*s == 'x' || *s == 'X') {
diff --git a/sql/backends/monet5/bam/bam_export.c
b/sql/backends/monet5/bam/bam_export.c
--- a/sql/backends/monet5/bam/bam_export.c
+++ b/sql/backends/monet5/bam/bam_export.c
@@ -112,7 +112,7 @@ fill_bam_alig(str qname, sht flag, str r
{ // cigar
str s, t;
int i, op;
- long x;
+ long x; /* type long returned by strtol() */
c->n_cigar = 0;
if (cigar[0] != '*') {
uint32_t *cigar_enc;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
