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

Another valgrind-caught leak.

Browse Source
This commit is contained in:
rocky
2005-04-10 14:52:52 +00:00
parent c89b50e07e
commit 102ea21ddd
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/cdda-player.c
View File

@@ -1,5 +1,5 @@
/* /*
$Id: cdda-player.c,v 1.30 2005/03/31 00:24:32 rocky Exp $ $Id: cdda-player.c,v 1.31 2005/04/10 14:52:52 rocky Exp $
Copyright (C) 2005 Rocky Bernstein <rocky@panix.com> Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
@@ -279,7 +279,7 @@ xperror(const char *psz_msg)
} }
static void static void
oops(const char *psz_msg, int rc) finish(const char *psz_msg, int rc)
{ {
if (interactive) { if (interactive) {
mvprintw(LINE_LAST, 0, (char *) "%s, exiting...\n", psz_msg); mvprintw(LINE_LAST, 0, (char *) "%s, exiting...\n", psz_msg);
@@ -289,7 +289,11 @@ oops(const char *psz_msg, int rc)
tty_restore(); tty_restore();
#ifdef HAVE_CDDB #ifdef HAVE_CDDB
if (p_conn) cddb_destroy(p_conn); if (p_conn) cddb_destroy(p_conn);
cddb_disc_destroy(p_cddb_disc);
#if LIBCDDB_VERSION_NUM >= 1
libcddb_shutdown();
#endif #endif
#endif /*HAVE_CDDB*/
cdio_destroy (p_cdio); cdio_destroy (p_cdio);
free (psz_device); free (psz_device);
exit (rc); exit (rc);
@@ -325,6 +329,7 @@ cd_eject(void)
if (!b_ok) if (!b_ok)
xperror("eject"); xperror("eject");
b_cd = 0; b_cd = 0;
cdio_destroy (p_cdio);
p_cdio = NULL; p_cdio = NULL;
} }
return b_ok; return b_ok;
@@ -1575,7 +1580,7 @@ main(int argc, char *argv[])
} }
if (!nostop) cd_stop(p_cdio); if (!nostop) cd_stop(p_cdio);
tty_restore(); tty_restore();
oops("bye", i_rc); finish("bye", i_rc);
return 0; /* keep compiler happy */ return 0; /* keep compiler happy */
} }