diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/forms_compatability.cxx | 2 | ||||
| -rw-r--r-- | src/vsnprintf.c | 26 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/forms_compatability.cxx b/src/forms_compatability.cxx index 01bcb2eb7..7642860da 100755 --- a/src/forms_compatability.cxx +++ b/src/forms_compatability.cxx @@ -185,7 +185,7 @@ void fl_show_alert(const char *q1,const char *q2,const char *q3,int) { } int fl_show_question(const char *q1,const char *q2,const char *q3) { - return fl_ask("%s\n%s\n%s", q1?q1:"", q2?q2:"", q3?q3:""); + return fl_choice("%s\n%s\n%s", "No", "Yes", 0L, q1?q1:"", q2?q2:"", q3?q3:""); } int fl_show_choice( diff --git a/src/vsnprintf.c b/src/vsnprintf.c index 96a8b85a6..f9986b6a7 100644 --- a/src/vsnprintf.c +++ b/src/vsnprintf.c @@ -97,7 +97,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if ((format - bufformat + 1) > sizeof(tformat) || (width + 2) > sizeof(temp)) break; - strncpy(tformat, bufformat, format - bufformat); + strncpy(tformat, bufformat, (size_t)(format - bufformat)); tformat[format - bufformat] = '\0'; sprintf(temp, tformat, va_arg(ap, double)); @@ -106,7 +106,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if (bufptr) { if ((bufptr + strlen(temp)) > bufend) { - strncpy(bufptr, temp, bufend - bufptr); + strncpy(bufptr, temp, (size_t)(bufend - bufptr)); bufptr = bufend; break; } else { @@ -127,7 +127,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if ((format - bufformat + 1) > sizeof(tformat) || (width + 2) > sizeof(temp)) break; - strncpy(tformat, bufformat, format - bufformat); + strncpy(tformat, bufformat, (size_t)(format - bufformat)); tformat[format - bufformat] = '\0'; sprintf(temp, tformat, va_arg(ap, int)); @@ -136,7 +136,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if (bufptr) { if ((bufptr + strlen(temp)) > bufend) { - strncpy(bufptr, temp, bufend - bufptr); + strncpy(bufptr, temp, (size_t)(bufend - bufptr)); bufptr = bufend; break; } else { @@ -150,7 +150,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if ((format - bufformat + 1) > sizeof(tformat) || (width + 2) > sizeof(temp)) break; - strncpy(tformat, bufformat, format - bufformat); + strncpy(tformat, bufformat, (size_t)(format - bufformat)); tformat[format - bufformat] = '\0'; sprintf(temp, tformat, va_arg(ap, void *)); @@ -159,7 +159,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if (bufptr) { if ((bufptr + strlen(temp)) > bufend) { - strncpy(bufptr, temp, bufend - bufptr); + strncpy(bufptr, temp, (size_t)(bufend - bufptr)); bufptr = bufend; break; } else { @@ -177,7 +177,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { else { if ((bufptr + width) > bufend) width = bufend - bufptr; - memcpy(bufptr, va_arg(ap, char *), width); + memcpy(bufptr, va_arg(ap, char *), (size_t)width); bufptr += width; } } @@ -197,11 +197,11 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if (slen > width) slen = width; if (sign == '-') { - strncpy(bufptr, s, slen); - memset(bufptr + slen, ' ', width - slen); + strncpy(bufptr, s, (size_t)slen); + memset(bufptr + slen, ' ', (size_t)(width - slen)); } else { - memset(bufptr, ' ', width - slen); - strncpy(bufptr + width - slen, s, slen); + memset(bufptr, ' ', (size_t)(width - slen)); + strncpy(bufptr + width - slen, s, (size_t)slen); } bufptr += width; @@ -212,7 +212,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if ((format - bufformat + 1) > sizeof(tformat) || (width + 2) > sizeof(temp)) break; - strncpy(tformat, bufformat, format - bufformat); + strncpy(tformat, bufformat, (size_t)(format - bufformat)); tformat[format - bufformat] = '\0'; sprintf(temp, tformat, va_arg(ap, int)); @@ -221,7 +221,7 @@ int fl_vsnprintf(char* buffer, size_t bufsize, const char* format, va_list ap) { if (bufptr) { if ((bufptr + strlen(temp)) > bufend) { - strncpy(bufptr, temp, bufend - bufptr); + strncpy(bufptr, temp, (size_t)(bufend - bufptr)); bufptr = bufend; break; } else { |