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

core: avoid maybe-uninitialized compiler warning with nmp_cache_iter_for_each()

Browse source 
CC       src/devices/src_libNetworkManager_la-nm-device.lo
  In file included from src/devices/nm-device.c:45:0:
  src/devices/nm-device.c: In function ‘_v4_has_shadowed_routes_detect’:
  ./src/platform/nmp-object.h:400:54: error: ‘o’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
     _obj ? &_NM_CONSTCAST (NMPObject, _obj)->ip4_route : NULL; \
                                                        ^
  src/devices/nm-device.c:2774:19: note: ‘o’ was declared here
    const NMPObject *o;
                     ^
This commit is contained in:
Thomas Haller 2017-09-21 13:13:27 +02:00
parent 85e3f956ad
commit 8022ed3ab2
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/platform/nmp-object.h
View file

@ -564,10 +564,9 @@ nmp_cache_iter_next (NMDedupMultiIter *iter, const NMPObject **out_obj)
gboolean has_next;
has_next = nm_dedup_multi_iter_next (iter);
if (has_next) {
nm_assert (NMP_OBJECT_IS_VALID (iter->current->obj));
NM_SET_OUT (out_obj, iter->current->obj);
}
nm_assert (!has_next || NMP_OBJECT_IS_VALID (iter->current->obj));
if (out_obj)
*out_obj = has_next ? iter->current->obj : NULL;
return has_next;
}
@ -577,10 +576,9 @@ nmp_cache_iter_next_link (NMDedupMultiIter *iter, const NMPlatformLink **out_obj
gboolean has_next;
has_next = nm_dedup_multi_iter_next (iter);
if (has_next) {
nm_assert (NMP_OBJECT_GET_TYPE (iter->current->obj) == NMP_OBJECT_TYPE_LINK);
NM_SET_OUT (out_obj, &(((const NMPObject *) iter->current->obj)->link));
}
nm_assert (!has_next || NMP_OBJECT_GET_TYPE (iter->current->obj) == NMP_OBJECT_TYPE_LINK);
if (out_obj)
*out_obj = has_next ? &(((const NMPObject *) iter->current->obj)->link) : NULL;
return has_next;
}