fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-22 09:20:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

platform: minor cleanup of assertions in nm_platform_cache_update_emit_signal()

Browse source 
NMTST_ASSERT_PLATFORM_NETNS_CURRENT() already checks that the current namespace
is correct. Remove the duplicate assertion.

Also, NMP_CACHE_OPS_UNCHANGED is numerically identical to NM_PLATFORM_SIGNAL_NONE.
Use it in the assertion.
This commit is contained in:
Thomas Haller 2018-03-09 17:35:57 +01:00 • committed by Beniamino Galvani
parent a2f1a93817
commit d6bbac1b7d
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/platform/nm-platform.c
View file

@ -6415,14 +6415,13 @@ nm_platform_cache_update_emit_signal (NMPlatform *self,
const NMPObject *o;
const NMPClass *klass;
nm_assert (NM_IN_SET ((NMPlatformSignalChangeType) cache_op, (NMPlatformSignalChangeType) NMP_CACHE_OPS_UNCHANGED, NM_PLATFORM_SIGNAL_ADDED, NM_PLATFORM_SIGNAL_CHANGED, NM_PLATFORM_SIGNAL_REMOVED));
nm_assert (NM_IN_SET ((NMPlatformSignalChangeType) cache_op, NM_PLATFORM_SIGNAL_NONE,
NM_PLATFORM_SIGNAL_ADDED,
NM_PLATFORM_SIGNAL_CHANGED,
NM_PLATFORM_SIGNAL_REMOVED));
ASSERT_nmp_cache_ops (nm_platform_get_cache (self), cache_op, obj_old, obj_new);
nm_assert (NM_IN_SET (nm_platform_netns_get (self),
NULL,
nmp_netns_get_current ()));
NMTST_ASSERT_PLATFORM_NETNS_CURRENT (self);
switch (cache_op) {