[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 3 commits: proplist-util: Drop deprecated G_CONST_RETURN macro
Arun Raghavan
gitlab at gitlab.freedesktop.org
Mon Nov 23 19:07:33 UTC 2020
Arun Raghavan pushed to branch master at PulseAudio / pulseaudio
Commits:
b546beef by Arun Raghavan at 2020-11-23T19:02:33+00:00
proplist-util: Drop deprecated G_CONST_RETURN macro
The preference in glib is now to just use the const qualifier directly.
- - - - -
c442227c by Arun Raghavan at 2020-11-23T19:02:33+00:00
glib-mainloop: Drop deprecated g_get_current_time() usage
This uses the year 2038-safe g_get_real_time() as recommended instead.
Bumps GLib dependency to 2.28 as a result.
- - - - -
9055f5ba by Arun Raghavan at 2020-11-23T19:02:33+00:00
stream-restore,device-restore: Avoid unaligned access
Newer GCC warns us that the channel_map and volume in legacy entries are
accessed via pointers, and these might be unaligned as the legacy entry
is a packed structure. For this reason, we read out those values into
local variables before accessing them as pointers.
The warnings are:
[146/433] Compiling C object src/modules/module-device-restore.so.p/module-device-restore.c.o
../src/modules/module-device-restore.c: In function ‘legacy_entry_read’:
../src/modules/module-device-restore.c:554:51: warning: taking address of packed member of ‘struct legacy_entry’ may result in an unaligned pointer value [-Waddress-of-packed-member]
554 | if (le->volume_valid && !pa_channel_map_valid(&le->channel_map)) {
| ^~~~~~~~~~~~~~~~
../src/modules/module-device-restore.c:559:48: warning: taking address of packed member of ‘struct legacy_entry’ may result in an unaligned pointer value [-Waddress-of-packed-member]
559 | if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
| ^~~~~~~~~~~
../src/modules/module-device-restore.c:559:104: warning: taking address of packed member of ‘struct legacy_entry’ may result in an unaligned pointer value [-Waddress-of-packed-member]
559 | if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
| ^~~~~~~~~~~
../src/modules/module-device-restore.c:559:117: warning: taking address of packed member of ‘struct legacy_entry’ may result in an unaligned pointer value [-Waddress-of-packed-member]
559 | if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
| ^~~~~~~~~~~~~~~~
[211/433] Compiling C object src/modules/module-stream-restore.so.p/module-stream-restore.c.o
../src/modules/module-stream-restore.c: In function ‘legacy_entry_read’:
../src/modules/module-stream-restore.c:1076:51: warning: taking address of packed member of ‘struct legacy_entry’ may result in an unaligned pointer value [-Waddress-of-packed-member]
1076 | if (le->volume_valid && !pa_channel_map_valid(&le->channel_map)) {
| ^~~~~~~~~~~~~~~~
../src/modules/module-stream-restore.c:1081:48: warning: taking address of packed member of ‘struct legacy_entry’ may result in an unaligned pointer value [-Waddress-of-packed-member]
1081 | if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
| ^~~~~~~~~~~
../src/modules/module-stream-restore.c:1081:104: warning: taking address of packed member of ‘struct legacy_entry’ may result in an unaligned pointer value [-Waddress-of-packed-member]
1081 | if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
| ^~~~~~~~~~~
../src/modules/module-stream-restore.c:1081:117: warning: taking address of packed member of ‘struct legacy_entry’ may result in an unaligned pointer value [-Waddress-of-packed-member]
1081 | if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
|
- - - - -
6 changed files:
- configure.ac
- meson.build
- src/modules/module-device-restore.c
- src/modules/module-stream-restore.c
- src/pulse/glib-mainloop.c
- src/pulsecore/proplist-util.c
Changes:
=====================================
configure.ac
=====================================
@@ -894,7 +894,7 @@ AC_ARG_ENABLE([glib2],
AS_HELP_STRING([--disable-glib2],[Disable optional GLib 2 support]))
AS_IF([test "x$enable_glib2" != "xno"],
- [PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ], HAVE_GLIB20=1, HAVE_GLIB20=0)],
+ [PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.28.0 ], HAVE_GLIB20=1, HAVE_GLIB20=0)],
HAVE_GLIB20=0)
AS_IF([test "x$enable_glib2" = "xyes" && test "x$HAVE_GLIB20" = "x0"],
=====================================
meson.build
=====================================
@@ -556,7 +556,7 @@ if gio_dep.found()
cdata.set('HAVE_GSETTINGS', 1)
endif
-glib_dep = dependency('glib-2.0', version : '>= 2.4.0', required: get_option('glib'))
+glib_dep = dependency('glib-2.0', version : '>= 2.28.0', required: get_option('glib'))
if glib_dep.found()
cdata.set('HAVE_GLIB', 1)
endif
=====================================
src/modules/module-device-restore.c
=====================================
@@ -528,6 +528,8 @@ static bool legacy_entry_read(struct userdata *u, pa_datum *data, struct entry *
char port[PA_NAME_MAX];
} PA_GCC_PACKED;
struct legacy_entry *le;
+ pa_channel_map channel_map;
+ pa_cvolume volume;
pa_assert(u);
pa_assert(data);
@@ -551,12 +553,17 @@ static bool legacy_entry_read(struct userdata *u, pa_datum *data, struct entry *
return false;
}
- if (le->volume_valid && !pa_channel_map_valid(&le->channel_map)) {
+ /* Read these out before accessing contents via pointers as struct legacy_entry may not be adequately aligned for these
+ * members to be accessed directly */
+ channel_map = le->channel_map;
+ volume = le->volume;
+
+ if (le->volume_valid && !pa_channel_map_valid(&channel_map)) {
pa_log_warn("Invalid channel map.");
return false;
}
- if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
+ if (le->volume_valid && (!pa_cvolume_valid(&volume) || !pa_cvolume_compatible_with_channel_map(&volume, &channel_map))) {
pa_log_warn("Volume and channel map don't match.");
return false;
}
=====================================
src/modules/module-stream-restore.c
=====================================
@@ -1029,6 +1029,8 @@ static struct entry *legacy_entry_read(struct userdata *u, const char *name) {
pa_datum data;
struct legacy_entry *le;
struct entry *e;
+ pa_channel_map channel_map;
+ pa_cvolume volume;
pa_assert(u);
pa_assert(name);
@@ -1073,12 +1075,17 @@ static struct entry *legacy_entry_read(struct userdata *u, const char *name) {
goto fail;
}
- if (le->volume_valid && !pa_channel_map_valid(&le->channel_map)) {
+ /* Read these out before accessing contents via pointers as struct legacy_entry may not be adequately aligned for these
+ * members to be accessed directly */
+ channel_map = le->channel_map;
+ volume = le->volume;
+
+ if (le->volume_valid && !pa_channel_map_valid(&channel_map)) {
pa_log_warn("Invalid channel map stored in database for legacy stream");
goto fail;
}
- if (le->volume_valid && (!pa_cvolume_valid(&le->volume) || !pa_cvolume_compatible_with_channel_map(&le->volume, &le->channel_map))) {
+ if (le->volume_valid && (!pa_cvolume_valid(&volume) || !pa_cvolume_compatible_with_channel_map(&volume, &channel_map))) {
pa_log_warn("Invalid volume stored in database for legacy stream");
goto fail;
}
=====================================
src/pulse/glib-mainloop.c
=====================================
@@ -482,16 +482,15 @@ static gboolean prepare_func(GSource *source, gint *timeout) {
return TRUE;
} else if (g->n_enabled_time_events) {
pa_time_event *t;
- GTimeVal now;
+ gint64 now;
struct timeval tvnow;
pa_usec_t usec;
t = find_next_time_event(g);
g_assert(t);
- g_get_current_time(&now);
- tvnow.tv_sec = now.tv_sec;
- tvnow.tv_usec = now.tv_usec;
+ now = g_get_real_time();
+ pa_timeval_store(&tvnow, now);
if (pa_timeval_cmp(&t->timeval, &tvnow) <= 0) {
*timeout = 0;
@@ -514,15 +513,14 @@ static gboolean check_func(GSource *source) {
return TRUE;
else if (g->n_enabled_time_events) {
pa_time_event *t;
- GTimeVal now;
+ gint64 now;
struct timeval tvnow;
t = find_next_time_event(g);
g_assert(t);
- g_get_current_time(&now);
- tvnow.tv_sec = now.tv_sec;
- tvnow.tv_usec = now.tv_usec;
+ now = g_get_real_time();
+ pa_timeval_store(&tvnow, now);
if (pa_timeval_cmp(&t->timeval, &tvnow) <= 0)
return TRUE;
@@ -558,16 +556,15 @@ static gboolean dispatch_func(GSource *source, GSourceFunc callback, gpointer us
}
if (g->n_enabled_time_events) {
- GTimeVal now;
+ gint64 now;
struct timeval tvnow;
pa_time_event *t;
t = find_next_time_event(g);
g_assert(t);
- g_get_current_time(&now);
- tvnow.tv_sec = now.tv_sec;
- tvnow.tv_usec = now.tv_usec;
+ now = g_get_real_time();
+ pa_timeval_store(&tvnow, now);
if (pa_timeval_cmp(&t->timeval, &tvnow) <= 0) {
=====================================
src/pulsecore/proplist-util.c
=====================================
@@ -45,14 +45,14 @@ extern char **environ;
#if defined(HAVE_GLIB) && defined(PA_GCC_WEAKREF)
#include <glib.h>
-static G_CONST_RETURN gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_application_name);
+static const gchar* _g_get_application_name(void) PA_GCC_WEAKREF(g_get_application_name);
#endif
#if defined(HAVE_GTK) && defined(PA_GCC_WEAKREF)
#pragma GCC diagnostic ignored "-Wstrict-prototypes"
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-static G_CONST_RETURN gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name);
+static const gchar* _gtk_window_get_default_icon_name(void) PA_GCC_WEAKREF(gtk_window_get_default_icon_name);
static Display *_gdk_display PA_GCC_WEAKREF(gdk_display);
#endif
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/d1e0594e939e3309435c966d994b0207b10f5175...9055f5baf37e379d5e3b556bff1741565442723e
--
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/d1e0594e939e3309435c966d994b0207b10f5175...9055f5baf37e379d5e3b556bff1741565442723e
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20201123/e89715b5/attachment-0001.htm>
More information about the pulseaudio-commits
mailing list