jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Warning fixes for 64bit visual c++ on Windows

Browse source
This commit is contained in:
William S Fulton 2015-07-03 19:06:39 +01:00
commit edcdaaec16
17 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/DOH/base.c
View file

@ -146,7 +146,7 @@ int DohLen(const DOH *obj) {
}
return 0;
} else {
return strlen((char *) obj);
return (int)strlen((char *) obj);
}
}
@ -636,7 +636,7 @@ int DohRead(DOH *obj, void *buffer, int length) {
return -1;
}
/* Hmmm. Not a file. Maybe it's a real FILE */
return fread(buffer, 1, length, (FILE *) b);
return (int)fread(buffer, 1, length, (FILE *) b);
}
/* -----------------------------------------------------------------------------
@ -654,7 +654,7 @@ int DohWrite(DOH *obj, const void *buffer, int length) {
return -1;
}
/* Hmmm. Not a file. Maybe it's a real FILE */
return fwrite(buffer, 1, length, (FILE *) b);
return (int)fwrite(buffer, 1, length, (FILE *) b);
}
/* -----------------------------------------------------------------------------

2
Source/DOH/file.c
View file

@ -52,7 +52,7 @@ static int File_read(DOH *fo, void *buffer, int len) {
DohFile *f = (DohFile *) ObjData(fo);
if (f->filep) {
return fread(buffer, 1, len, f->filep);
return (int)fread(buffer, 1, len, f->filep);
} else if (f->fd) {
#ifdef DOH_INTFILE
return read(f->fd, buffer, len);

18
Source/DOH/fio.c
View file

@ -304,9 +304,9 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
}
if (strlen(encoder)) {
enc = encode(encoder, Sval);
maxwidth = maxwidth + strlen(newformat) + Len(enc);
maxwidth = maxwidth + (int)strlen(newformat) + Len(enc);
} else {
maxwidth = maxwidth + strlen(newformat) + Len(Sval);
maxwidth = maxwidth + (int)strlen(newformat) + Len(Sval);
}
*(fmt++) = 's';
*fmt = 0;
@ -320,7 +320,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
} else {
nbytes += sprintf(stemp, newformat, Data(Sval));
}
if (Writen(so, stemp, strlen(stemp)) < 0)
if (Writen(so, stemp, (int)strlen(stemp)) < 0)
return -1;
if ((DOH *) Sval != doh) {
Delete(Sval);
@ -346,7 +346,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
} else {
enc = 0;
}
maxwidth = maxwidth + strlen(newformat) + strlen((char *) doh);
maxwidth = maxwidth + (int)strlen(newformat) + (int)strlen((char *) doh);
*(fmt++) = 's';
*fmt = 0;
if ((maxwidth + 1) < OBUFLEN) {
@ -355,7 +355,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
stemp = (char *) DohMalloc(maxwidth + 1);
}
nbytes += sprintf(stemp, newformat, doh);
if (Writen(so, stemp, strlen(stemp)) < 0)
if (Writen(so, stemp, (int)strlen(stemp)) < 0)
return -1;
if (stemp != obuffer) {
DohFree(stemp);
@ -366,7 +366,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
} else {
*(fmt++) = *p;
*fmt = 0;
maxwidth = maxwidth + strlen(newformat) + 64;
maxwidth = maxwidth + (int)strlen(newformat) + 64;
/* Only allocate a buffer if it is too big to fit. Shouldn't have to do
this very often */
@ -401,7 +401,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
default:
break;
}
if (Writen(so, stemp, strlen(stemp)) < 0)
if (Writen(so, stemp, (int)strlen(stemp)) < 0)
return -1;
if (stemp != obuffer)
DohFree(stemp);
@ -414,7 +414,7 @@ int DohvPrintf(DOH *so, const char *format, va_list ap) {
if (state) {
int r;
*fmt = 0;
r = Writen(so, fmt, strlen(fmt));
r = Writen(so, fmt, (int)strlen(fmt));
if (r < 0)
return -1;
nbytes += r;
@ -455,7 +455,7 @@ int DohPrintv(DOHFile * f, ...) {
if (DohCheck(obj)) {
ret += DohDump(obj, f);
} else {
ret += DohWrite(f, obj, strlen((char *) obj));
ret += DohWrite(f, obj, (int)strlen((char *) obj));
}
}
va_end(ap);

4
Source/DOH/string.c
View file

@ -687,7 +687,7 @@ static int replace_simple(String *str, char *token, char *rep, int flags, int co
return 0;
base = str->str;
tokenlen = strlen(token);
tokenlen = (int)strlen(token);
s = (*match) (base, base, token, tokenlen);
if (!s)
@ -724,7 +724,7 @@ static int replace_simple(String *str, char *token, char *rep, int flags, int co
}
first = s;
replen = strlen(rep);
replen = (int)strlen(rep);
delta = (replen - tokenlen);