forked from len0rd/rockbox
tools: Fix up a bunch of compilation warnings
Plenty more to go. Change-Id: I3f6e6686d3e581bb97493d40dcb7df74650ba96c
This commit is contained in:
parent
d114429d88
commit
61d70de7f4
5 changed files with 47 additions and 47 deletions
|
@ -120,7 +120,6 @@ int mkboot_iriver(const char* infile, const char* bootfile, const char* outfile,
|
||||||
f = fopen(bootfile, "rb");
|
f = fopen(bootfile, "rb");
|
||||||
if(!f) {
|
if(!f) {
|
||||||
perror(bootfile);
|
perror(bootfile);
|
||||||
fclose(f);
|
|
||||||
return -4;
|
return -4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -143,6 +143,10 @@ bool encode_file(FILE *fin, FILE *fout, float quality, int complexity,
|
||||||
int a;
|
int a;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
numchan = 0;
|
||||||
|
bps = 0;
|
||||||
|
sr = 0;
|
||||||
|
|
||||||
if (!get_wave_metadata(fin, &numchan, &bps, &sr, &numsamples)) {
|
if (!get_wave_metadata(fin, &numchan, &bps, &sr, &numsamples)) {
|
||||||
snprintf(errstr, errlen, "invalid WAV file");
|
snprintf(errstr, errlen, "invalid WAV file");
|
||||||
return false;
|
return false;
|
||||||
|
@ -181,7 +185,7 @@ bool encode_file(FILE *fin, FILE *fout, float quality, int complexity,
|
||||||
ret = false;
|
ret = false;
|
||||||
goto finish;
|
goto finish;
|
||||||
}
|
}
|
||||||
if (fread(in, 2, numsamples, fin) != numsamples) {
|
if (fread(in, 2, numsamples, fin) != (size_t)numsamples) {
|
||||||
snprintf(errstr, errlen, "could not read input file data");
|
snprintf(errstr, errlen, "could not read input file data");
|
||||||
ret = false;
|
ret = false;
|
||||||
goto finish;
|
goto finish;
|
||||||
|
@ -250,7 +254,7 @@ bool encode_file(FILE *fin, FILE *fout, float quality, int complexity,
|
||||||
nbytes = speex_bits_write_whole_bytes(&bits, cbits, 200);
|
nbytes = speex_bits_write_whole_bytes(&bits, cbits, 200);
|
||||||
|
|
||||||
/* Write the compressed data */
|
/* Write the compressed data */
|
||||||
if (fwrite(cbits, 1, nbytes, fout) != nbytes) {
|
if (fwrite(cbits, 1, nbytes, fout) != (size_t)nbytes) {
|
||||||
snprintf(errstr, errlen, "could not write output data");
|
snprintf(errstr, errlen, "could not write output data");
|
||||||
ret = false;
|
ret = false;
|
||||||
goto finish;
|
goto finish;
|
||||||
|
@ -258,7 +262,7 @@ bool encode_file(FILE *fin, FILE *fout, float quality, int complexity,
|
||||||
}
|
}
|
||||||
/* Squeeze out the last bits */
|
/* Squeeze out the last bits */
|
||||||
nbytes = speex_bits_write(&bits, cbits, 200);
|
nbytes = speex_bits_write(&bits, cbits, 200);
|
||||||
if (fwrite(cbits, 1, nbytes, fout) != nbytes) {
|
if (fwrite(cbits, 1, nbytes, fout) != (size_t)nbytes) {
|
||||||
snprintf(errstr, errlen, "could not write output data");
|
snprintf(errstr, errlen, "could not write output data");
|
||||||
ret = false;
|
ret = false;
|
||||||
}
|
}
|
||||||
|
@ -273,5 +277,3 @@ finish:
|
||||||
free(in);
|
free(in);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -180,7 +180,7 @@ int main(int argc, char* argv[])
|
||||||
#ifdef __WIN32__
|
#ifdef __WIN32__
|
||||||
snprintf(ipod.diskname,sizeof(ipod.diskname),"\\\\.\\PhysicalDrive%s",argv[1]);
|
snprintf(ipod.diskname,sizeof(ipod.diskname),"\\\\.\\PhysicalDrive%s",argv[1]);
|
||||||
#else
|
#else
|
||||||
strncpy(ipod.diskname,argv[1],sizeof(ipod.diskname));
|
strncpy(ipod.diskname,argv[1],sizeof(ipod.diskname)-1);
|
||||||
#endif
|
#endif
|
||||||
i = 2;
|
i = 2;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -172,7 +172,7 @@ int main(int argc, char* argv[])
|
||||||
#ifdef __WIN32__
|
#ifdef __WIN32__
|
||||||
snprintf(sansa.diskname,sizeof(sansa.diskname),"\\\\.\\PhysicalDrive%s",argv[1]);
|
snprintf(sansa.diskname,sizeof(sansa.diskname),"\\\\.\\PhysicalDrive%s",argv[1]);
|
||||||
#else
|
#else
|
||||||
strncpy(sansa.diskname,argv[1],sizeof(sansa.diskname));
|
strncpy(sansa.diskname,argv[1],sizeof(sansa.diskname)-1);
|
||||||
#endif
|
#endif
|
||||||
i = 2;
|
i = 2;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -65,7 +65,7 @@ int CodeEditor::lineNumberAreaWidth()
|
||||||
++digits;
|
++digits;
|
||||||
}
|
}
|
||||||
|
|
||||||
int space = 3 + fontMetrics().width(QLatin1Char('9')) * digits;
|
int space = 3 + fontMetrics().horizontalAdvance(QLatin1Char('9')) * digits;
|
||||||
|
|
||||||
return space;
|
return space;
|
||||||
}
|
}
|
||||||
|
@ -267,4 +267,3 @@ void CodeEditor::lineNumberAreaPaintEvent(QPaintEvent *event)
|
||||||
++blockNumber;
|
++blockNumber;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue