claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate short option on --no-cddb. On CDDB error give a

Browse Source 
better error message.
This commit is contained in:
rocky
2004-04-21 09:23:38 +00:00
parent ab28079a6c
commit 08ee2840ff
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cd-info.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cd-info.c,v 1.51 2004/03/24 11:24:44 rocky Exp $ $Id: cd-info.c,v 1.52 2004/04/21 09:23:38 rocky Exp $
Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com> Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org> Copyright (C) 1996, 1997, 1998 Gerd Knorr <kraxel@bytesex.org>
@@ -136,8 +136,8 @@ parse_options (int argc, const char *argv[])
"Don't filesystem analysis"}, "Don't filesystem analysis"},
#ifdef HAVE_CDDB #ifdef HAVE_CDDB
{"no-cddb", 'a', POPT_ARG_NONE, &opts.no_cddb, 0, {"no-cddb", '\0', POPT_ARG_NONE, &opts.no_cddb, 0,
"Don't look up audio CDDB information or print that"}, "Don't look up audio CDDB information or print that"},
{"cddb-port", 'P', POPT_ARG_INT, &opts.cddb_port, 8880, {"cddb-port", 'P', POPT_ARG_INT, &opts.cddb_port, 8880,
"CDDB port number to use (default 8880)"}, "CDDB port number to use (default 8880)"},
@@ -426,7 +426,7 @@ print_cddb_info(CdIo *cdio, track_t num_tracks, track_t first_track_num) {
matches = cddb_query(conn, disc); matches = cddb_query(conn, disc);
if (-1 == matches) if (-1 == matches)
printf("%s: %s\n", program_name, cddb_error_str(errno)); printf("%s: %s\n", program_name, cddb_error_str(cddb_errno(conn)));
else { else {
printf("%s: Found %d matches in CDDB\n", program_name, matches); printf("%s: Found %d matches in CDDB\n", program_name, matches);
for (i=1; i<=matches; i++) { for (i=1; i<=matches; i++) {