diff options
| author | Max Kellermann <max@duempel.org> | 2014-12-01 22:22:29 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-12-01 22:22:29 +0100 |
| commit | fbf76c6d213a89b384cabb58bfc7e63cc969c718 (patch) | |
| tree | 160531cd1be881ecb8eddacf7c5ceb1244a517a0 | |
| parent | bc00c38f9db4ea182b73461434adaede91298a59 (diff) | |
| download | mpd-fbf76c6d213a89b384cabb58bfc7e63cc969c718.tar.gz mpd-fbf76c6d213a89b384cabb58bfc7e63cc969c718.tar.xz mpd-fbf76c6d213a89b384cabb58bfc7e63cc969c718.zip | |
input/cdio_paranoia: use CopyString() instead of g_strlcpy()
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/input/plugins/CdioParanoiaInputPlugin.cxx | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ce9619dce..58dc6dcd7 100644 --- a/configure.ac +++ b/configure.ac @@ -780,9 +780,8 @@ AM_CONDITIONAL(ENABLE_SOUNDCLOUD, test x$enable_soundcloud = xyes) AC_SUBST(YAJL_LIBS) dnl ---------------------------------- cdio --------------------------------- -MPD_ENABLE_AUTO_PKG_DEPENDS(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia], - [libcdio_paranoia input plugin], [libcdio_paranoia not found], [], - [enable_glib], [Cannot use --enable-cdio-paranoia with --disable-glib]) +MPD_ENABLE_AUTO_PKG(cdio_paranoia, CDIO_PARANOIA, [libcdio_paranoia], + [libcdio_paranoia input plugin], [libcdio_paranoia not found]) if test x$enable_cdio_paranoia = xyes; then AC_CHECK_HEADERS(cdio/paranoia/paranoia.h) fi diff --git a/src/input/plugins/CdioParanoiaInputPlugin.cxx b/src/input/plugins/CdioParanoiaInputPlugin.cxx index f847b35c1..2b45a34aa 100644 --- a/src/input/plugins/CdioParanoiaInputPlugin.cxx +++ b/src/input/plugins/CdioParanoiaInputPlugin.cxx @@ -39,7 +39,6 @@ #include <stddef.h> #include <string.h> #include <stdlib.h> -#include <glib.h> #include <assert.h> #ifdef HAVE_CDIO_PARANOIA_PARANOIA_H @@ -149,7 +148,7 @@ parse_cdio_uri(struct cdio_uri *dest, const char *src, Error &error) const char *slash = strrchr(src, '/'); if (slash == nullptr) { /* play the whole CD in the specified drive */ - g_strlcpy(dest->device, src, sizeof(dest->device)); + CopyString(dest->device, src, sizeof(dest->device)); dest->track = -1; return true; } |