Shortened long lines.
Added error: tag to error message. Corrected output file format error message.
This commit is contained in:
@@ -110,8 +110,8 @@ int breaks (char *name, int format, int gaps)
|
|||||||
Cd *cd = NULL;
|
Cd *cd = NULL;
|
||||||
|
|
||||||
if (NULL == (cd = cf_parse(name, &format))) {
|
if (NULL == (cd = cf_parse(name, &format))) {
|
||||||
fprintf(stderr, "%s: error: unable to parse input file "
|
fprintf(stderr, "%s: error: unable to parse input file"
|
||||||
"`%s'\n", progname, name);
|
" `%s'\n", progname, name);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -155,8 +155,8 @@ int main (int argc, char **argv)
|
|||||||
} else if (0 == strcmp("toc", optarg)) {
|
} else if (0 == strcmp("toc", optarg)) {
|
||||||
format = TOC;
|
format = TOC;
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "%s: error: unknown input file "
|
fprintf(stderr, "%s: error: unknown input file"
|
||||||
"format `%s'\n", progname, optarg);
|
" format `%s'\n", progname, optarg);
|
||||||
usage(1);
|
usage(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -49,8 +49,8 @@ int convert (char *iname, int iformat, char *oname, int oformat)
|
|||||||
Cd *cd = NULL;
|
Cd *cd = NULL;
|
||||||
|
|
||||||
if (NULL == (cd = cf_parse(iname, &iformat))) {
|
if (NULL == (cd = cf_parse(iname, &iformat))) {
|
||||||
fprintf(stderr, "%s: error: unable to parse input file "
|
fprintf(stderr, "%s: error: unable to parse input file"
|
||||||
"`%s'\n", progname, iname);
|
" `%s'\n", progname, iname);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,8 +105,8 @@ int main (int argc, char **argv)
|
|||||||
} else if (0 == strcmp("toc", optarg)) {
|
} else if (0 == strcmp("toc", optarg)) {
|
||||||
iformat = TOC;
|
iformat = TOC;
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "%s: error: unknown input file "
|
fprintf(stderr, "%s: error: unknown input file"
|
||||||
"format `%s'\n", progname, optarg);
|
" format `%s'\n", progname, optarg);
|
||||||
usage(1);
|
usage(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -116,8 +116,8 @@ int main (int argc, char **argv)
|
|||||||
} else if (0 == strcmp("toc", optarg)) {
|
} else if (0 == strcmp("toc", optarg)) {
|
||||||
oformat = TOC;
|
oformat = TOC;
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "%s: error: unknown input file "
|
fprintf(stderr, "%s: error: unknown output file"
|
||||||
"format `%s'\n", progname, optarg);
|
" format `%s'\n", progname, optarg);
|
||||||
usage(1);
|
usage(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -331,7 +331,8 @@ int info (char *name, int format, int trackno, char *d_template, char *t_templat
|
|||||||
int ntrack;
|
int ntrack;
|
||||||
|
|
||||||
if (NULL == (cd = cf_parse(name, &format))) {
|
if (NULL == (cd = cf_parse(name, &format))) {
|
||||||
fprintf(stderr, "%s: input file error\n", name);
|
fprintf(stderr, "%s: error: unable to parse input file"
|
||||||
|
" `%s'\n", progname, name);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -348,7 +349,7 @@ int info (char *name, int format, int trackno, char *d_template, char *t_templat
|
|||||||
} else if (0 < trackno && ntrack >= trackno) {
|
} else if (0 < trackno && ntrack >= trackno) {
|
||||||
cd_printf(t_template, cd, trackno);
|
cd_printf(t_template, cd, trackno);
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "%s: track number out of range\n", progname);
|
fprintf(stderr, "%s: error: track number out of range\n", progname);
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -452,8 +453,8 @@ int main (int argc, char **argv)
|
|||||||
} else if (0 == strcmp("toc", optarg)) {
|
} else if (0 == strcmp("toc", optarg)) {
|
||||||
format = TOC;
|
format = TOC;
|
||||||
} else {
|
} else {
|
||||||
fprintf(stderr, "%s: error: unknown input file "
|
fprintf(stderr, "%s: error: unknown input file"
|
||||||
"format `%s'\n", progname, optarg);
|
" format `%s'\n", progname, optarg);
|
||||||
usage(1);
|
usage(1);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user