Fix a bunch of compiler warnings (mainly MinGW).

This commit is contained in:
Erik de Castro Lopo
2013-04-07 13:44:33 +10:00
parent 6a9a18ff7a
commit b9574fe589
7 changed files with 22 additions and 20 deletions

View File

@@ -39,7 +39,7 @@
#define ENDSWAP_32(x) (_byteswap_ulong (x))
#elif HAVE_BYTESWAP_H /* Linux */
#elif defined HAVE_BYTESWAP_H /* Linux */
#include <byteswap.h>

View File

@@ -2406,6 +2406,10 @@ FLAC__StreamEncoderWriteStatus write_frame_(FLAC__StreamEncoder *encoder, const
FLAC__StreamEncoderWriteStatus status;
FLAC__uint64 output_position = 0;
#if FLAC__HAS_OGG == 0
(void)is_last_block;
#endif
/* FLAC__STREAM_ENCODER_TELL_STATUS_UNSUPPORTED just means we didn't get the offset; no error */
if(encoder->private_->tell_callback && encoder->private_->tell_callback(encoder, &output_position, encoder->private_->client_data) == FLAC__STREAM_ENCODER_TELL_STATUS_ERROR) {
encoder->protected_->state = FLAC__STREAM_ENCODER_CLIENT_ERROR;

View File

@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
#endif
#ifdef _WIN32
if (get_utf8_argv(&argc, &argv) != 0) {
fprintf(stderr, "%ERROR: failed to convert command line parameters to UTF-8\n");
fputs("ERROR: failed to convert command line parameters to UTF-8\n", stderr);
return 1;
}
#endif

View File

@@ -220,13 +220,11 @@ static char *posixly_correct;
whose names are inconsistent. */
#ifndef getenv
extern char *getenv ();
extern char *getenv (const char * name);
#endif
static char *
my_index (str, chr)
const char *str;
int chr;
my_index (const char *str, int chr)
{
while (*str)
{

View File

@@ -359,7 +359,7 @@ static struct inverse_map *make_inverse_map(const unsigned short *from)
return to;
}
int wctomb_8bit(void *map1, char *s, int wc1)
static int wctomb_8bit(void *map1, char *s, int wc1)
{
struct map *map = map1;
unsigned short wc = wc1;

View File

@@ -182,7 +182,7 @@ int utf8_encode(const char *from, char **to)
/* On NT-based windows systems, we could use WideCharToMultiByte(), but
* MS doesn't actually have a consistent API across win32.
*/
*to = make_utf8_string(unicode);
*to = (char*)make_utf8_string(unicode);
free(unicode);
return 0;
@@ -196,7 +196,7 @@ int utf8_decode(const char *from, char **to)
/* On NT-based windows systems, we could use MultiByteToWideChar(CP_UTF8), but
* MS doesn't actually have a consistent API across win32.
*/
unicode = make_unicode_string(from);
unicode = make_unicode_string((const unsigned char*)from);
if(unicode == NULL)
{
fprintf(stderr, "Out of memory processing string from UTF8 to UNICODE16\n");

View File

@@ -48,9 +48,9 @@ typedef struct {
static FLAC__bool stop_signal_ = false;
static void our_sigint_handler_(int signal)
static void our_sigint_handler_(int signum)
{
(void)signal;
(void)signum;
printf("(caught SIGINT) ");
fflush(stdout);
stop_signal_ = true;