colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nm-setting: mangle public constant to make g-ir-scanner happy

Browse Source 
Some versions of g-ir-scanner's C parser silently coerce unrecognized
symbols into zeroes [1]. Let's avoid that so that we don't end up with
wrong constants in our Gir data.

[1] https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/366

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1446
This commit is contained in:
Lubomir Rintel
2022-11-02 23:30:56 +01:00
parent e7b1fd9dbc
commit 08e845f651
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libnm-core-impl/nm-setting.c
View File

@@ -16,6 +16,12 @@
#include "nm-utils-private.h" #include "nm-utils-private.h"
#include "nm-utils.h" #include "nm-utils.h"
/* We rely on this in src/libnm-core-public/nm-setting.h */
G_STATIC_ASSERT(G_PARAM_USER_SHIFT == 8);
G_STATIC_ASSERT(NM_SETTING_PARAM_REQUIRED, (1 << (1 + G_PARAM_USER_SHIFT)));
G_STATIC_ASSERT(NM_SETTING_PARAM_SECRET, (1 << (2 + G_PARAM_USER_SHIFT)));
G_STATIC_ASSERT(NM_SETTING_PARAM_FUZZY_IGNORE, (1 << (3 + G_PARAM_USER_SHIFT)));
/** /**
* SECTION:nm-setting * SECTION:nm-setting
* @short_description: Describes related configuration information * @short_description: Describes related configuration information

13
src/libnm-core-public/nm-setting.h
View File

@@ -23,16 +23,23 @@ G_BEGIN_DECLS
#define NM_SETTING_GET_CLASS(obj) \ #define NM_SETTING_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING, NMSettingClass)) (G_TYPE_INSTANCE_GET_CLASS((obj), NM_TYPE_SETTING, NMSettingClass))
/*
* The literals are used below (as opposed to e.g.
* (1 << (1 + G_PARAM_USER_SHIFT))), because g-ir-scanner sometimes gets
* confused by unknown tokens and silently treats them as zero:
* https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/366
*/
/* The property of the #NMSetting is required for the setting to be valid */ /* The property of the #NMSetting is required for the setting to be valid */
#define NM_SETTING_PARAM_REQUIRED (1 << (1 + G_PARAM_USER_SHIFT)) #define NM_SETTING_PARAM_REQUIRED 0x100
/* The property of the #NMSetting is a secret */ /* The property of the #NMSetting is a secret */
#define NM_SETTING_PARAM_SECRET (1 << (2 + G_PARAM_USER_SHIFT)) #define NM_SETTING_PARAM_SECRET 0x200
/* The property of the #NMSetting should be ignored during comparisons that /* The property of the #NMSetting should be ignored during comparisons that
* use the %NM_SETTING_COMPARE_FLAG_FUZZY flag. * use the %NM_SETTING_COMPARE_FLAG_FUZZY flag.
*/ */
#define NM_SETTING_PARAM_FUZZY_IGNORE (1 << (3 + G_PARAM_USER_SHIFT)) #define NM_SETTING_PARAM_FUZZY_IGNORE 0x400
/* Note: all non-glib GParamFlags bits are reserved by NetworkManager */ /* Note: all non-glib GParamFlags bits are reserved by NetworkManager */