diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2005-04-11 07:35:33 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2005-04-11 07:35:33 +0000 |
| commit | e72630762df5d3dfb34bf0866b7d908c93108bff (patch) | |
| tree | 1a26152243e0f59ef329cea4bb89fa97e6bb72de /src/vsnprintf.c | |
| parent | e9a3f0e927853890a424f8f46273dc010f3980e3 (diff) | |
Remove all warnings for Mac buidl with gcc (except one)
- some warnings about using char for indexing
- some warnings about using signed int in strncmp
- some warnings about deprecated fl_ask (replaced with fl_choice)
The on warning not removed is the strftime("%c") in fluid since
I don't know anything about PS and I don't know if a different
data format would break PS. Mike?
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4270 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/vsnprintf.c')
| -rw-r--r-- | src/vsnprintf.c | 26 |
1 files changed, 13 insertions, 13 deletions
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 { |