Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
31e29e62
Commit
31e29e62
authored
Jun 10, 2014
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
zeroconf/Avahi: call dbus_shutdown() during shutdown
Make valgrind happy.
parent
dfcb5729
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
29 deletions
+5
-29
configure.ac
configure.ac
+1
-1
ZeroconfAvahi.cxx
src/zeroconf/ZeroconfAvahi.cxx
+4
-0
valgrind.suppressions
valgrind.suppressions
+0
-28
No files found.
configure.ac
View file @
31e29e62
...
@@ -825,7 +825,7 @@ avahi)
...
@@ -825,7 +825,7 @@ avahi)
;;
;;
esac
esac
MPD_AUTO_PKG(avahi, AVAHI, [avahi-client],
MPD_AUTO_PKG(avahi, AVAHI, [avahi-client
dbus-1
],
[avahi client library], [avahi-client not found])
[avahi client library], [avahi-client not found])
if test x$enable_avahi = xyes; then
if test x$enable_avahi = xyes; then
AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])
AC_DEFINE([HAVE_AVAHI], 1, [Define to enable Avahi Zeroconf support])
...
...
src/zeroconf/ZeroconfAvahi.cxx
View file @
31e29e62
...
@@ -34,6 +34,8 @@
...
@@ -34,6 +34,8 @@
#include <avahi-common/malloc.h>
#include <avahi-common/malloc.h>
#include <avahi-common/error.h>
#include <avahi-common/error.h>
#include <dbus/dbus.h>
static
constexpr
Domain
avahi_domain
(
"avahi"
);
static
constexpr
Domain
avahi_domain
(
"avahi"
);
static
char
*
avahiName
;
static
char
*
avahiName
;
...
@@ -272,4 +274,6 @@ AvahiDeinit(void)
...
@@ -272,4 +274,6 @@ AvahiDeinit(void)
avahi_free
(
avahiName
);
avahi_free
(
avahiName
);
avahiName
=
nullptr
;
avahiName
=
nullptr
;
dbus_shutdown
();
}
}
valgrind.suppressions
View file @
31e29e62
...
@@ -297,34 +297,6 @@
...
@@ -297,34 +297,6 @@
fun:dlclose
fun:dlclose
}
}
# is that a leak in libdbus?
{
<insert a suppression name here>
Memcheck:Leak
fun:?alloc
...
obj:*/libdbus-*.so.*
fun:avahi_client_new
}
{
<insert a suppression name here>
Memcheck:Leak
fun:malloc
obj:/usr/lib/libdbus-1.so.3.4.0
fun:dbus_message_new_error
obj:/usr/lib/libdbus-1.so.3.4.0
fun:dbus_connection_send_with_reply
fun:dbus_connection_send_with_reply_and_block
obj:/usr/lib/libavahi-client.so.3.2.4
fun:avahi_entry_group_new
fun:avahiRegisterService
fun:avahiClientCallback
obj:/usr/lib/libavahi-client.so.3.2.4
fun:avahi_client_new
}
{
{
inet_ntoa
inet_ntoa
Memcheck:Leak
Memcheck:Leak
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment