Fix some inconsequential file descriptor leaks in the demo tools to silence cppcheck warnings.

This commit is contained in:
Gregory Maxwell 2011-10-29 23:54:45 -04:00 committed by Jean-Marc Valin
parent a44e95abd0
commit 38fc0d59bc
3 changed files with 17 additions and 0 deletions

View file

@ -97,6 +97,7 @@ int main(int argc, char *argv[])
if (!fout) if (!fout)
{ {
fprintf (stderr, "Could not open output file %s\n", argv[argc-1]); fprintf (stderr, "Could not open output file %s\n", argv[argc-1]);
fclose(fin);
return 1; return 1;
} }
@ -104,12 +105,16 @@ int main(int argc, char *argv[])
if (err != 0) if (err != 0)
{ {
fprintf(stderr, "Failed to create the encoder: %s\n", opus_strerror(err)); fprintf(stderr, "Failed to create the encoder: %s\n", opus_strerror(err));
fclose(fin);
fclose(fout);
return 1; return 1;
} }
dec = opus_custom_decoder_create(mode, channels, &err); dec = opus_custom_decoder_create(mode, channels, &err);
if (err != 0) if (err != 0)
{ {
fprintf(stderr, "Failed to create the decoder: %s\n", opus_strerror(err)); fprintf(stderr, "Failed to create the decoder: %s\n", opus_strerror(err));
fclose(fin);
fclose(fout);
return 1; return 1;
} }
opus_custom_decoder_ctl(dec, OPUS_GET_LOOKAHEAD(&skip)); opus_custom_decoder_ctl(dec, OPUS_GET_LOOKAHEAD(&skip));

View file

@ -312,6 +312,7 @@ int main(int argc, char *argv[])
if (!fout) if (!fout)
{ {
fprintf (stderr, "Could not open output file %s\n", argv[argc-1]); fprintf (stderr, "Could not open output file %s\n", argv[argc-1]);
fclose(fin);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
@ -321,6 +322,8 @@ int main(int argc, char *argv[])
if (err != OPUS_OK) if (err != OPUS_OK)
{ {
fprintf(stderr, "Cannot create encoder: %s\n", opus_strerror(err)); fprintf(stderr, "Cannot create encoder: %s\n", opus_strerror(err));
fclose(fin);
fclose(fout);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps)); opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate_bps));
@ -341,6 +344,8 @@ int main(int argc, char *argv[])
if (err != OPUS_OK) if (err != OPUS_OK)
{ {
fprintf(stderr, "Cannot create decoder: %s\n", opus_strerror(err)); fprintf(stderr, "Cannot create decoder: %s\n", opus_strerror(err));
fclose(fin);
fclose(fout);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }
@ -434,6 +439,8 @@ int main(int argc, char *argv[])
if (len[toggle] < 0) if (len[toggle] < 0)
{ {
fprintf (stderr, "opus_encode() returned %d\n", len[toggle]); fprintf (stderr, "opus_encode() returned %d\n", len[toggle]);
fclose(fin);
fclose(fout);
return EXIT_FAILURE; return EXIT_FAILURE;
} }
} }
@ -485,6 +492,8 @@ int main(int argc, char *argv[])
(long)count, (long)count,
(unsigned long)enc_final_range[toggle^use_inbandfec], (unsigned long)enc_final_range[toggle^use_inbandfec],
(unsigned long)dec_final_range); (unsigned long)dec_final_range);
fclose(fin);
fclose(fout);
return EXIT_FAILURE; return EXIT_FAILURE;
} }

View file

@ -72,6 +72,7 @@ int main(int argc, char *argv[])
if(fout==NULL) if(fout==NULL)
{ {
fprintf(stderr, "Error opening output file: %s\n", argv[argc-1]); fprintf(stderr, "Error opening output file: %s\n", argv[argc-1]);
fclose(fin);
return 1; return 1;
} }
@ -94,6 +95,8 @@ int main(int argc, char *argv[])
eof = 1; eof = 1;
} else { } else {
fprintf(stderr, "Invalid payload length\n"); fprintf(stderr, "Invalid payload length\n");
fclose(fin);
fclose(fout);
return 1; return 1;
} }
break; break;