diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-03-02 23:47:42 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-03-02 23:47:42 -0800 |
| commit | 05de38d11e2ec5f49995ab0325b1acf137434a16 (patch) | |
| tree | 648f44d347a5729dc65bb95cc43e58db38e88f96 | |
| parent | 80f3e39eb858db060d9edede6edf7592b7f24934 (diff) | |
| download | zlib-05de38d11e2ec5f49995ab0325b1acf137434a16.tar.gz zlib-05de38d11e2ec5f49995ab0325b1acf137434a16.tar.bz2 zlib-05de38d11e2ec5f49995ab0325b1acf137434a16.zip | |
Cast to char * in gzprintf to avoid warnings [Zinser].
| -rw-r--r-- | gzwrite.c | 23 |
1 files changed, 12 insertions, 11 deletions
| @@ -338,19 +338,19 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...) | |||
| 338 | va_start(va, format); | 338 | va_start(va, format); |
| 339 | #ifdef NO_vsnprintf | 339 | #ifdef NO_vsnprintf |
| 340 | # ifdef HAS_vsprintf_void | 340 | # ifdef HAS_vsprintf_void |
| 341 | (void)vsprintf(state->in, format, va); | 341 | (void)vsprintf((char *)(state->in), format, va); |
| 342 | va_end(va); | 342 | va_end(va); |
| 343 | for (len = 0; len < size; len++) | 343 | for (len = 0; len < size; len++) |
| 344 | if (state->in[len] == 0) break; | 344 | if (state->in[len] == 0) break; |
| 345 | # else | 345 | # else |
| 346 | len = vsprintf(state->in, format, va); | 346 | len = vsprintf((char *)(state->in), format, va); |
| 347 | va_end(va); | 347 | va_end(va); |
| 348 | # endif | 348 | # endif |
| 349 | #else | 349 | #else |
| 350 | # ifdef HAS_vsnprintf_void | 350 | # ifdef HAS_vsnprintf_void |
| 351 | (void)vsnprintf(state->in, size, format, va); | 351 | (void)vsnprintf((char *)(state->in), size, format, va); |
| 352 | va_end(va); | 352 | va_end(va); |
| 353 | len = strlen(state->in); | 353 | len = strlen((char *)(state->in)); |
| 354 | # else | 354 | # else |
| 355 | len = vsnprintf((char *)(state->in), size, format, va); | 355 | len = vsnprintf((char *)(state->in), size, format, va); |
| 356 | va_end(va); | 356 | va_end(va); |
| @@ -416,22 +416,23 @@ int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, | |||
| 416 | state->in[size - 1] = 0; | 416 | state->in[size - 1] = 0; |
| 417 | #ifdef NO_snprintf | 417 | #ifdef NO_snprintf |
| 418 | # ifdef HAS_sprintf_void | 418 | # ifdef HAS_sprintf_void |
| 419 | sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8, | 419 | sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, |
| 420 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | 420 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); |
| 421 | for (len = 0; len < size; len++) | 421 | for (len = 0; len < size; len++) |
| 422 | if (state->in[len] == 0) break; | 422 | if (state->in[len] == 0) break; |
| 423 | # else | 423 | # else |
| 424 | len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8, | 424 | len = sprintf((char *)(state->in), format, a1, a2, a3, a4, a5, a6, a7, a8, |
| 425 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | 425 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); |
| 426 | # endif | 426 | # endif |
| 427 | #else | 427 | #else |
| 428 | # ifdef HAS_snprintf_void | 428 | # ifdef HAS_snprintf_void |
| 429 | snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8, | 429 | snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, a7, a8, |
| 430 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | 430 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); |
| 431 | len = strlen(state->in); | 431 | len = strlen((char *)(state->in)); |
| 432 | # else | 432 | # else |
| 433 | len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8, | 433 | len = snprintf((char *)(state->in), size, format, a1, a2, a3, a4, a5, a6, |
| 434 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | 434 | a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, |
| 435 | a19, a20); | ||
| 435 | # endif | 436 | # endif |
| 436 | #endif | 437 | #endif |
| 437 | 438 | ||
