Revision: 37528
http://brlcad.svn.sourceforge.net/brlcad/?rev=37528&view=rev
Author: bob1961
Date: 2010-02-02 21:03:18 +0000 (Tue, 02 Feb 2010)
Log Message:
-----------
Quell some warnings when compiling 64-bit Windows.
Modified Paths:
--------------
brlcad/trunk/src/libbu/bitv.c
brlcad/trunk/src/libbu/brlcad_path.c
brlcad/trunk/src/libbu/convert.c
brlcad/trunk/src/libbu/dirname.c
brlcad/trunk/src/libbu/fopen_uniq.c
brlcad/trunk/src/libbu/malloc.c
brlcad/trunk/src/libbu/mappedfile.c
brlcad/trunk/src/libbu/parse.c
brlcad/trunk/src/libbu/temp.c
brlcad/trunk/src/libbu/units.c
brlcad/trunk/src/libbu/vls.c
Modified: brlcad/trunk/src/libbu/bitv.c
===================================================================
--- brlcad/trunk/src/libbu/bitv.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/bitv.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -201,8 +201,8 @@
void
bu_bitv_to_hex(struct bu_vls *v, const struct bu_bitv *bv)
{
- unsigned int word_count = 0;
- unsigned int chunksize = 0;
+ size_t word_count = 0;
+ size_t chunksize = 0;
/* necessarily volatile to keep the compiler from complaining
* about unreachable code during optimization.
*/
@@ -212,7 +212,7 @@
BU_CK_BITV(bv);
word_count = bv->nbits / 8 / BVS;
- bu_vls_extend(v, word_count * BVS * 2 + 1);
+ bu_vls_extend(v, (unsigned int)(word_count * BVS * 2 + 1));
while (word_count--) {
chunksize = (unsigned int)BVS;
@@ -233,8 +233,8 @@
int bytes;
struct bu_bitv *bv;
unsigned long c;
- int word_count;
- unsigned int chunksize = 0;
+ size_t word_count;
+ size_t chunksize = 0;
volatile size_t BVS = sizeof(bitv_t);
abyte[2] = '\0';
Modified: brlcad/trunk/src/libbu/brlcad_path.c
===================================================================
--- brlcad/trunk/src/libbu/brlcad_path.c 2010-02-02 20:09:17 UTC (rev
37527)
+++ brlcad/trunk/src/libbu/brlcad_path.c 2010-02-02 21:03:18 UTC (rev
37528)
@@ -285,7 +285,7 @@
HIDDEN int
_bu_find_path(char result[MAXPATHLEN], const char *lhs, const char *rhs,
struct bu_vls *searched, const char *where)
{
- int llen, rlen;
+ size_t llen, rlen;
static const char *currdir=".";
/* swap right with left if there is no left so logic is simplified
@@ -425,7 +425,7 @@
lhs = bu_getprogname();
if (lhs) {
char argv0[MAX_WHERE_SIZE] = {0};
- int len = strlen(lhs);
+ size_t len = strlen(lhs);
snprintf(argv0, MAX_WHERE_SIZE, "%s", lhs);
/* need to trim off the trailing binary */
Modified: brlcad/trunk/src/libbu/convert.c
===================================================================
--- brlcad/trunk/src/libbu/convert.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/convert.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -124,7 +124,7 @@
bu_cv_fmt_cookie(char *buf, size_t buflen, int cookie)
{
register char *cp = buf;
- unsigned int len;
+ size_t len;
if (buflen == 0) {
fprintf(stderr, "bu_cv_pr_cookie: call me with a bigger buffer\n");
@@ -342,7 +342,7 @@
int limit;
register int i;
- limit = size / sizeof(signed short);
+ limit = (int)(size / sizeof(signed short));
if (limit < count) count = limit;
for (i=0; i<count; i++) {
@@ -364,7 +364,7 @@
int limit;
register int i;
- limit = size / sizeof(unsigned short);
+ limit = (int)(size / sizeof(unsigned short));
if (limit < count) count = limit;
for (i=0; i<count; i++) {
@@ -382,7 +382,7 @@
int limit;
register int i;
- limit = size / sizeof(signed long int);
+ limit = (int)(size / sizeof(signed long int));
if (limit < count) count = limit;
for (i=0; i<count; i++) {
@@ -404,7 +404,7 @@
int limit;
register int i;
- limit = size / sizeof(unsigned long int);
+ limit = (int)(size / sizeof(unsigned long int));
if (limit < count) count = limit;
for (i=0; i<count; i++) {
@@ -426,7 +426,7 @@
register unsigned char *cp = (unsigned char *)out;
register int val;
- limit = size / 2;
+ limit = (int)(size / 2);
if (count > limit) count = limit;
for (i=0; i<count; i++) {
@@ -445,7 +445,7 @@
register unsigned char *cp = (unsigned char *)out;
register int val;
- limit = size / 2;
+ limit = (int)(size / 2);
if (count > limit) count = limit;
for (i=0; i<count; i++) {
@@ -464,7 +464,7 @@
register unsigned char *cp = (unsigned char *)out;
register long val;
- limit = size / 4;
+ limit = (int)(size / 4);
if (count > limit) count = limit;
for (i=0; i<count; i++) {
@@ -485,7 +485,7 @@
register unsigned char *cp = (unsigned char *)out;
register long val;
- limit = size / 4;
+ limit = (int)(size / 4);
if (count > limit) {
count = limit;
}
@@ -557,7 +557,7 @@
* remaining before doing the memmove.
*/
if ((unsigned int)count * outsize > size) {
- number_done = size / outsize;
+ number_done = (int)(size / outsize);
} else {
number_done = count;
}
@@ -642,7 +642,7 @@
/*
* Get number of full entries that can be converted
*/
- remaining = size / outsize;
+ remaining = (int)(size / outsize);
/*
* If number of entries that would fit in the output buffer is
Modified: brlcad/trunk/src/libbu/dirname.c
===================================================================
--- brlcad/trunk/src/libbu/dirname.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/dirname.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -30,7 +30,7 @@
{
char *ret;
char *slash;
- int len;
+ size_t len;
const char *SLASH = "/";
const char *DOT = ".";
const char *DOTDOT = "..";
Modified: brlcad/trunk/src/libbu/fopen_uniq.c
===================================================================
--- brlcad/trunk/src/libbu/fopen_uniq.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/fopen_uniq.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -37,7 +37,9 @@
/* c99 doesn't declare these */
+#if !defined(_WIN32) || defined(__CYGWIN__)
extern FILE *fdopen(int, const char *);
+#endif
FILE *
Modified: brlcad/trunk/src/libbu/malloc.c
===================================================================
--- brlcad/trunk/src/libbu/malloc.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/malloc.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -420,7 +420,7 @@
/* Even if ptr didn't change, need to update cnt & barrier */
bu_semaphore_acquire(BU_SEM_SYSCALL);
mp->mdb_addr = ptr;
- mp->mdb_len = cnt;
+ mp->mdb_len = (int)cnt;
/* Install a barrier word at the new end of the dynamic
* arena. Correct location depends on 'cnt' being rounded up,
@@ -435,7 +435,7 @@
ptr = (genptr_t)(((struct memqdebug *)ptr)+1);
mqp->m.magic = MDB_MAGIC;
mqp->m.mdb_addr = ptr;
- mqp->m.mdb_len = cnt;
+ mqp->m.mdb_len = (int)cnt;
mqp->m.mdb_str = str;
BU_ASSERT(bu_memq != BU_LIST_NULL);
BU_LIST_APPEND(bu_memq, &(mqp->q));
Modified: brlcad/trunk/src/libbu/mappedfile.c
===================================================================
--- brlcad/trunk/src/libbu/mappedfile.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/mappedfile.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -142,7 +142,8 @@
if (appl) mp->appl = bu_strdup(appl);
#ifdef HAVE_SYS_STAT_H
- mp->buflen = (size_t)sb.st_size;
+ /* The buflen member of "struct bu_mapped_file" should be a size_t. */
+ mp->buflen = (long)sb.st_size;
mp->modtime = (long)sb.st_mtime;
# ifdef HAVE_SYS_MMAN_H
Modified: brlcad/trunk/src/libbu/parse.c
===================================================================
--- brlcad/trunk/src/libbu/parse.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/parse.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -197,7 +197,7 @@
register int lenstr;
/* include the terminating null */
- lenstr = strlen(loc) + 1;
+ lenstr = (int)strlen(loc) + 1;
len = lenstr;
@@ -385,7 +385,7 @@
{
BU_CK_GETPUT(ext);
- return (fwrite(ext->ext_buf, 1, ext->ext_nbytes, fp));
+ return (int)(fwrite(ext->ext_buf, 1, ext->ext_nbytes, fp));
}
@@ -398,7 +398,7 @@
ext->ext_buf = (genptr_t) bu_malloc(6, "bu_struct_get buffer head");
bu_semaphore_acquire(BU_SEM_SYSCALL); /* lock */
- i=fread((char *) ext->ext_buf, 1, 6, fp); /* res_syscall */
+ i=(long)fread((char *) ext->ext_buf, 1, 6, fp); /* res_syscall */
bu_semaphore_release(BU_SEM_SYSCALL); /* unlock */
if (i != 6) {
@@ -428,7 +428,7 @@
ext->ext_buf = (genptr_t) bu_realloc((char *) ext->ext_buf, len,
"bu_struct_get full buffer");
bu_semaphore_acquire(BU_SEM_SYSCALL); /* lock */
- i=fread((char *) ext->ext_buf + 6, 1, len-6, fp); /* res_syscall */
+ i=(long)fread((char *) ext->ext_buf + 6, 1, len-6, fp); /* res_syscall
*/
bu_semaphore_release(BU_SEM_SYSCALL); /* unlock */
if (i != len-6) {
bu_log("ERROR: bu_struct_get bad fread (%ld), file %s, line %d\n",
@@ -845,7 +845,7 @@
HIDDEN void
_bu_matprint(const char *name, register const double *mat)
{
- int delta = strlen(name)+2;
+ int delta = (int)strlen(name)+2;
/* indent the body of the matrix */
bu_log_indent_delta(delta);
@@ -871,7 +871,7 @@
const char *name,
register const double *mat)
{
- int delta = strlen(name)+2;
+ int delta = (int)strlen(name)+2;
/* indent the body of the matrix */
bu_log_indent_delta(delta);
@@ -1008,9 +1008,9 @@
for (sdp = parsetab; sdp->sp_name != (char *)0; sdp++) {
/* Skip alternate keywords for same value */
- if (lastoff == sdp->sp_offset)
+ if (lastoff == (int)sdp->sp_offset)
continue;
- lastoff = sdp->sp_offset;
+ lastoff = (int)sdp->sp_offset;
loc = (char *)(base + sdp->sp_offset);
@@ -1047,7 +1047,7 @@
/* fall through */
case 'V':
{
- int delta = strlen(sdp->sp_name)+2;
+ int delta = (int)strlen(sdp->sp_name)+2;
register struct bu_vls *vls =
(struct bu_vls *)loc;
@@ -1099,7 +1099,7 @@
bu_log("\n");
} else {
- int delta = strlen(sdp->sp_name)+2;
+ int delta = (int)strlen(sdp->sp_name)+2;
bu_log_indent_delta(delta);
@@ -1141,18 +1141,18 @@
register int tmpi;
register char *cp;
- int increase = strlen(name) + 3 + 32 * count;
+ int increase = (int)(strlen(name) + 3 + 32 * count);
bu_vls_extend(vls, increase);
cp = vls->vls_str + vls->vls_offset + vls->vls_len;
snprintf(cp, increase, "%s%s=%.27G", (vls->vls_len?" ":""), name, *dp++);
- tmpi = strlen(cp);
+ tmpi = (int)strlen(cp);
vls->vls_len += tmpi;
while (--count > 0) {
cp += tmpi;
sprintf(cp, "%c%.27G", COMMA, *dp++);
- tmpi = strlen(cp);
+ tmpi = (int)strlen(cp);
vls->vls_len += tmpi;
}
}
@@ -1179,9 +1179,9 @@
for (; sdp->sp_name != (char*)NULL; sdp++) {
/* Skip alternate keywords for same value */
- if (lastoff == sdp->sp_offset)
+ if (lastoff == (int)sdp->sp_offset)
continue;
- lastoff = sdp->sp_offset;
+ lastoff = (int)sdp->sp_offset;
loc = (char *)(base + sdp->sp_offset);
@@ -1210,7 +1210,7 @@
if (sdp->sp_count < 1)
break;
if (sdp->sp_count == 1) {
- increase = strlen(sdp->sp_name)+6;
+ increase = (int)strlen(sdp->sp_name)+6;
bu_vls_extend(vls, increase);
cp = vls->vls_str + vls->vls_offset + vls->vls_len;
if (*loc == '"')
@@ -1232,7 +1232,7 @@
++p;
++count;
}
- increase = strlen(sdp->sp_name)+strlen(loc)+5+count;
+ increase = (int)(strlen(sdp->sp_name)+strlen(loc)+5+count);
bu_vls_extend(vls, increase);
cp = vls->vls_str + vls->vls_offset + vls->vls_len;
@@ -1254,7 +1254,7 @@
*p++ = '"';
*p = '\0';
}
- vls->vls_len += strlen(cp);
+ vls->vls_len += (int)strlen(cp);
break;
case 'S': /* XXX - DEPRECATED [7.14] */
printf("DEVELOPER DEPRECATION NOTICE: Using %%S for string
printing is deprecated, use %%V instead\n");
@@ -1263,7 +1263,7 @@
{
register struct bu_vls *vls_p = (struct bu_vls *)loc;
- increase = bu_vls_strlen(vls_p) + 5 + strlen(sdp->sp_name);
+ increase = (int)(bu_vls_strlen(vls_p) + 5 +
strlen(sdp->sp_name));
bu_vls_extend(vls, increase);
cp = vls->vls_str + vls->vls_offset + vls->vls_len;
@@ -1271,7 +1271,7 @@
(vls->vls_len?" ":""),
sdp->sp_name,
bu_vls_addr(vls_p));
- vls->vls_len += strlen(cp);
+ vls->vls_len += (int)strlen(cp);
}
break;
case 'i':
@@ -1280,7 +1280,7 @@
register short *sp = (short *)loc;
register int tmpi;
- increase = 64 * i + strlen(sdp->sp_name) + 3;
+ increase = 64 * i + (int)strlen(sdp->sp_name) + 3;
bu_vls_extend(vls, increase);
@@ -1288,13 +1288,13 @@
snprintf(cp, increase, "%s%s=%d",
(vls->vls_len?" ":""),
sdp->sp_name, *sp++);
- tmpi = strlen(cp);
+ tmpi = (int)strlen(cp);
vls->vls_len += tmpi;
while (--i > 0) {
cp += tmpi;
sprintf(cp, "%c%d", COMMA, *sp++);
- tmpi = strlen(cp);
+ tmpi = (int)strlen(cp);
vls->vls_len += tmpi;
}
}
@@ -1305,20 +1305,20 @@
register int *dp = (int *)loc;
register int tmpi;
- increase = 64 * i + strlen(sdp->sp_name) + 3;
+ increase = (int)(64 * i + strlen(sdp->sp_name) + 3);
bu_vls_extend(vls, increase);
cp = vls->vls_str + vls->vls_offset + vls->vls_len;
snprintf(cp, increase, "%s%s=%d",
(vls->vls_len?" ":""),
sdp->sp_name, *dp++);
- tmpi = strlen(cp);
+ tmpi = (int)strlen(cp);
vls->vls_len += tmpi;
while (--i > 0) {
cp += tmpi;
sprintf(cp, "%c%d", COMMA, *dp++);
- tmpi = strlen(cp);
+ tmpi = (int)strlen(cp);
vls->vls_len += tmpi;
}
}
@@ -1355,9 +1355,9 @@
for (sdp = parsetab; sdp->sp_name != (char *)0; sdp++) {
/* Skip alternate keywords for same value */
- if (lastoff == sdp->sp_offset)
+ if (lastoff == (int)sdp->sp_offset)
continue;
- lastoff = sdp->sp_offset;
+ lastoff = (int)sdp->sp_offset;
loc = (char *)(base + sdp->sp_offset);
@@ -1390,7 +1390,7 @@
/* fall through */
case 'V':
{
- int delta = strlen(sdp->sp_name)+2;
+ int delta = (int)strlen(sdp->sp_name)+2;
register struct bu_vls *vls =
(struct bu_vls *)loc;
@@ -1445,7 +1445,7 @@
bu_vls_printf(vls_out, "\n");
} else {
- int delta = strlen(sdp->sp_name)+2;
+ int delta = (int)strlen(sdp->sp_name)+2;
bu_log_indent_delta(delta);
bu_vls_printf(vls_out, " %s=%.25G\n", sdp->sp_name,
*dp++);
Modified: brlcad/trunk/src/libbu/temp.c
===================================================================
--- brlcad/trunk/src/libbu/temp.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/temp.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -37,7 +37,9 @@
/* c99 doesn't declare these */
+#if !defined(_WIN32) || defined(__CYGWIN__)
extern FILE *fdopen(int, const char *);
+#endif
struct _bu_tf_list {
@@ -127,8 +129,8 @@
int fd = -1;
int counter = 0;
char *filepath = NULL;
- int i;
- int start, end;
+ size_t i;
+ size_t start, end;
static const char replace[] =
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
static int replacelen = sizeof(replace) - 1;
Modified: brlcad/trunk/src/libbu/units.c
===================================================================
--- brlcad/trunk/src/libbu/units.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/units.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -177,7 +177,7 @@
register const struct cvt_tab *tp;
register const struct conv_table *cvtab;
char ubuf[256];
- int len;
+ size_t len;
bu_strlcpy(ubuf, str, sizeof(ubuf));
Modified: brlcad/trunk/src/libbu/vls.c
===================================================================
--- brlcad/trunk/src/libbu/vls.c 2010-02-02 20:09:17 UTC (rev 37527)
+++ brlcad/trunk/src/libbu/vls.c 2010-02-02 21:03:18 UTC (rev 37528)
@@ -311,10 +311,10 @@
/* cancel offset before extending */
vp->vls_offset = 0;
if (len+1 >= (size_t)vp->vls_max)
- bu_vls_extend(vp, len+1);
+ bu_vls_extend(vp, (unsigned int)len+1);
memcpy(vp->vls_str, s, len+1); /* include null */
- vp->vls_len = len;
+ vp->vls_len = (int)len;
}
@@ -339,11 +339,11 @@
/* cancel offset before extending */
vp->vls_offset = 0;
if (len+1 >= (size_t)vp->vls_max)
- bu_vls_extend(vp, len+1);
+ bu_vls_extend(vp, (unsigned int)len+1);
memcpy(vp->vls_str, s, len);
vp->vls_str[len] = '\0'; /* force null termination */
- vp->vls_len = len;
+ vp->vls_len = (int)len;
}
@@ -360,10 +360,10 @@
return;
if ((size_t)vp->vls_offset + (size_t)vp->vls_len + len+1 >=
(size_t)vp->vls_max)
- bu_vls_extend(vp, len+1);
+ bu_vls_extend(vp, (unsigned int)len+1);
memcpy(vp->vls_str +vp->vls_offset + vp->vls_len, s, len+1); /* include
null */
- vp->vls_len += len;
+ vp->vls_len += (int)len;
}
@@ -384,10 +384,10 @@
return;
if ((size_t)vp->vls_offset + (size_t)vp->vls_len + len+1 >=
(size_t)vp->vls_max)
- bu_vls_extend(vp, len+1);
+ bu_vls_extend(vp, (unsigned int)len+1);
memcpy(vp->vls_str + vp->vls_offset + vp->vls_len, s, len);
- vp->vls_len += len;
+ vp->vls_len += (int)len;
vp->vls_str[vp->vls_offset + vp->vls_len] = '\0'; /* force null
termination */
}
@@ -402,7 +402,7 @@
return;
if (dest->vls_offset + dest->vls_len + src->vls_len+1 >= dest->vls_max)
- bu_vls_extend(dest, (unsigned)src->vls_len+1);
+ bu_vls_extend(dest, (unsigned int)src->vls_len+1);
/* copy source string, including null */
memcpy(dest->vls_str +dest->vls_offset + dest->vls_len,
src->vls_str+src->vls_offset, (size_t)src->vls_len+1);
@@ -557,7 +557,7 @@
void
bu_vls_fwrite(FILE *fp, const struct bu_vls *vp)
{
- int status;
+ size_t status;
BU_CK_VLS(vp);
@@ -586,7 +586,7 @@
return;
bu_semaphore_acquire(BU_SEM_SYSCALL);
- status = write(fd, vp->vls_str + vp->vls_offset, (size_t)vp->vls_len);
+ status = (int)write(fd, vp->vls_str + vp->vls_offset, (size_t)vp->vls_len);
bu_semaphore_release(BU_SEM_SYSCALL);
if (status != vp->vls_len) {
@@ -610,7 +610,7 @@
todo = (size_t)vp->vls_max - vp->vls_len - vp->vls_offset - 1;
bu_semaphore_acquire(BU_SEM_SYSCALL);
- got = read(fd, vp->vls_str+vp->vls_offset+vp->vls_len, todo);
+ got = (int)read(fd, vp->vls_str+vp->vls_offset+vp->vls_len, todo);
bu_semaphore_release(BU_SEM_SYSCALL);
if (got < 0) {
@@ -781,7 +781,7 @@
str = va_arg(ap, char *);
if (str) {
if (flags & FIELDLEN) {
- int stringlen = strlen(str);
+ int stringlen = (int)strlen(str);
int left_justify;
if ((left_justify = (fieldlen < 0)))
@@ -1040,7 +1040,7 @@
{
size_t len = strlen(str);
- bu_vls_extend(vp, len);
+ bu_vls_extend(vp, (unsigned int)len);
/* memmove is supposed to be safe even if strings overlap */
memmove(vp->vls_str+vp->vls_offset+len, vp->vls_str+vp->vls_offset,
(size_t)vp->vls_len);
@@ -1048,7 +1048,7 @@
/* insert the data at the head of the string */
memcpy(vp->vls_str+vp->vls_offset, str, len);
- vp->vls_len += len;
+ vp->vls_len += (int)len;
}
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Planet: dedicated and managed hosting, cloud storage, colocation
Stay online with enterprise data centers and the best network in the business
Choose flexible plans and management services without long-term contracts
Personal 24x7 support from experience hosting pros just a phone call away.
http://p.sf.net/sfu/theplanet-com
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
