mkvparser/sample: Minor clean up.

- Return EXIT_FAILURE/EXIT_SUCCESS from main().
- Fix usage.

Change-Id: Id22d9c5cff9c8e220b4d19c519bf35f8b69ed2df
This commit is contained in:
Tom Finegan 2016-03-29 09:02:52 -07:00
parent 2e0e906eac
commit 0ba80bcbf4

View File

@ -70,18 +70,16 @@ bool ColourValuePresent(long long value) {
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
if (argc == 1) { if (argc == 1) {
printf("\t\t\tMkv Parser Sample Application\n"); printf("Mkv Parser Sample Application\n");
printf("\t\t\tUsage: \n"); printf(" Usage: %s <input file> \n", argv[0]);
printf("\t\t\t ./sample [input file] \n"); return EXIT_FAILURE;
printf("\t\t\t ./sample sample.mkv \n");
return -1;
} }
mkvparser::MkvReader reader; mkvparser::MkvReader reader;
if (reader.Open(argv[1])) { if (reader.Open(argv[1])) {
printf("\n Filename is invalid or error while opening.\n"); printf("\n Filename is invalid or error while opening.\n");
return -1; return EXIT_FAILURE;
} }
int maj, min, build, rev; int maj, min, build, rev;
@ -96,7 +94,7 @@ int main(int argc, char* argv[]) {
long long ret = ebmlHeader.Parse(&reader, pos); long long ret = ebmlHeader.Parse(&reader, pos);
if (ret < 0) { if (ret < 0) {
printf("\n EBMLHeader::Parse() failed."); printf("\n EBMLHeader::Parse() failed.");
return -1; return EXIT_FAILURE;
} }
printf("\t\t\t EBML Header\n"); printf("\t\t\t EBML Header\n");
@ -112,7 +110,7 @@ int main(int argc, char* argv[]) {
ret = seg_t::CreateInstance(&reader, pos, pSegment_); ret = seg_t::CreateInstance(&reader, pos, pSegment_);
if (ret) { if (ret) {
printf("\n Segment::CreateInstance() failed."); printf("\n Segment::CreateInstance() failed.");
return -1; return EXIT_FAILURE;
} }
const std::auto_ptr<seg_t> pSegment(pSegment_); const std::auto_ptr<seg_t> pSegment(pSegment_);
@ -120,13 +118,13 @@ int main(int argc, char* argv[]) {
ret = pSegment->Load(); ret = pSegment->Load();
if (ret < 0) { if (ret < 0) {
printf("\n Segment::Load() failed."); printf("\n Segment::Load() failed.");
return -1; return EXIT_FAILURE;
} }
const mkvparser::SegmentInfo* const pSegmentInfo = pSegment->GetInfo(); const mkvparser::SegmentInfo* const pSegmentInfo = pSegment->GetInfo();
if (pSegmentInfo == NULL) { if (pSegmentInfo == NULL) {
printf("\n Segment::GetInfo() failed."); printf("\n Segment::GetInfo() failed.");
return -1; return EXIT_FAILURE;
} }
const long long timeCodeScale = pSegmentInfo->GetTimeCodeScale(); const long long timeCodeScale = pSegmentInfo->GetTimeCodeScale();
@ -329,7 +327,7 @@ int main(int argc, char* argv[]) {
if (clusterCount == 0) { if (clusterCount == 0) {
printf("\t\tSegment has no clusters.\n"); printf("\t\tSegment has no clusters.\n");
return -1; return EXIT_FAILURE;
} }
const mkvparser::Cluster* pCluster = pSegment->GetFirst(); const mkvparser::Cluster* pCluster = pSegment->GetFirst();
@ -349,7 +347,7 @@ int main(int argc, char* argv[]) {
{ {
printf("\t\tError parsing first block of cluster\n"); printf("\t\tError parsing first block of cluster\n");
fflush(stdout); fflush(stdout);
return -1; return EXIT_FAILURE;
} }
while ((pBlockEntry != NULL) && !pBlockEntry->EOS()) { while ((pBlockEntry != NULL) && !pBlockEntry->EOS()) {
@ -383,7 +381,7 @@ int main(int argc, char* argv[]) {
if (status < 0) { if (status < 0) {
printf("\t\t\tError parsing next block of cluster\n"); printf("\t\t\tError parsing next block of cluster\n");
fflush(stdout); fflush(stdout);
return -1; return EXIT_FAILURE;
} }
} }
@ -437,5 +435,5 @@ int main(int argc, char* argv[]) {
} }
fflush(stdout); fflush(stdout);
return 0; return EXIT_SUCCESS;
} }