system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-23 03:04:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

all: adjust glib-mkenums annotations for automated formatting

Browse source 
The annotation results in bad formatting. Work around.
This commit is contained in:
Thomas Haller 2022-02-02 12:36:28 +01:00
parent a2c4f071e4
commit e62792ff38
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
19 changed files with 240 additions and 240 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/contrib/nm-vpn-editor-plugin-call.h
View file

@ -27,9 +27,9 @@
* @NM_VPN_EDITOR_PLUGIN_SERVICE_FLAGS_CAN_ADD: whether the plugin can
* add a new connection for the given service-type.
**/
typedef enum { /*< skip >*/
NM_VPN_EDITOR_PLUGIN_SERVICE_FLAGS_NONE = 0x00,
NM_VPN_EDITOR_PLUGIN_SERVICE_FLAGS_CAN_ADD = 0x01,
typedef enum /*< skip >*/ {
NM_VPN_EDITOR_PLUGIN_SERVICE_FLAGS_NONE = 0x00,
NM_VPN_EDITOR_PLUGIN_SERVICE_FLAGS_CAN_ADD = 0x01,
} NMVpnEditorPluginServiceFlags;
struct _NMVpnEditorPluginVT {

6
src/libnm-client-public/nm-client.h
View file

@ -27,9 +27,9 @@ G_BEGIN_DECLS
*
* Since: 1.24
*/
typedef enum { /*< flags >*/
NM_CLIENT_INSTANCE_FLAGS_NONE = 0,
NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS = 1,
typedef enum /*< flags >*/ {
NM_CLIENT_INSTANCE_FLAGS_NONE = 0,
NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS = 1,
} NMClientInstanceFlags;
#define NM_TYPE_CLIENT (nm_client_get_type())

10
src/libnm-core-impl/tests/test-general-enums.h
View file

@ -25,11 +25,11 @@ typedef enum {
NM_TEST_GENERAL_META_FLAGS_0x4 = (1 << 4),
} NMTestGeneralMetaFlags;
typedef enum { /*< flags >*/
NM_TEST_GENERAL_COLOR_FLAGS_WHITE = 1, /*< skip >*/
NM_TEST_GENERAL_COLOR_FLAGS_BLUE = 2,
NM_TEST_GENERAL_COLOR_FLAGS_RED = 4,
NM_TEST_GENERAL_COLOR_FLAGS_GREEN = 8,
typedef enum /*< flags >*/ {
NM_TEST_GENERAL_COLOR_FLAGS_WHITE = 1, /*< skip >*/
NM_TEST_GENERAL_COLOR_FLAGS_BLUE = 2,
NM_TEST_GENERAL_COLOR_FLAGS_RED = 4,
NM_TEST_GENERAL_COLOR_FLAGS_GREEN = 8,
} NMTestGeneralColorFlags;
#endif /* _NM_TEST_GENERAL_ENUMS_H_ */

14
src/libnm-core-intern/nm-core-internal.h
View file

@ -189,14 +189,14 @@ NM_TERNARY_TO_OPTION_BOOL(NMTernary v)
NMSetting **_nm_connection_get_settings_arr(NMConnection *connection);
typedef enum { /*< skip >*/
NM_SETTING_PARSE_FLAGS_NONE = 0,
NM_SETTING_PARSE_FLAGS_STRICT = 1LL << 0,
NM_SETTING_PARSE_FLAGS_BEST_EFFORT = 1LL << 1,
NM_SETTING_PARSE_FLAGS_NORMALIZE = 1LL << 2,
typedef enum /*< skip >*/ {
NM_SETTING_PARSE_FLAGS_NONE = 0,
NM_SETTING_PARSE_FLAGS_STRICT = 1LL << 0,
NM_SETTING_PARSE_FLAGS_BEST_EFFORT = 1LL << 1,
NM_SETTING_PARSE_FLAGS_NORMALIZE = 1LL << 2,
_NM_SETTING_PARSE_FLAGS_LAST,
NM_SETTING_PARSE_FLAGS_ALL = ((_NM_SETTING_PARSE_FLAGS_LAST - 1) << 1) - 1,
_NM_SETTING_PARSE_FLAGS_LAST,
NM_SETTING_PARSE_FLAGS_ALL = ((_NM_SETTING_PARSE_FLAGS_LAST - 1) << 1) - 1,
} NMSettingParseFlags;
gboolean _nm_connection_replace_settings(NMConnection *connection,

18
src/libnm-core-intern/nm-meta-setting-base-impl.h
View file

@ -38,15 +38,15 @@
*
* 10: NMSettingUser
*/
typedef enum { /*< skip >*/
NM_SETTING_PRIORITY_INVALID = 0,
NM_SETTING_PRIORITY_CONNECTION = 1,
NM_SETTING_PRIORITY_HW_BASE = 2,
NM_SETTING_PRIORITY_HW_NON_BASE = 3,
NM_SETTING_PRIORITY_HW_AUX = 4,
NM_SETTING_PRIORITY_AUX = 5,
NM_SETTING_PRIORITY_IP = 6,
NM_SETTING_PRIORITY_USER = 10,
typedef enum /*< skip >*/ {
NM_SETTING_PRIORITY_INVALID = 0,
NM_SETTING_PRIORITY_CONNECTION = 1,
NM_SETTING_PRIORITY_HW_BASE = 2,
NM_SETTING_PRIORITY_HW_NON_BASE = 3,
NM_SETTING_PRIORITY_HW_AUX = 4,
NM_SETTING_PRIORITY_AUX = 5,
NM_SETTING_PRIORITY_IP = 6,
NM_SETTING_PRIORITY_USER = 10,
} NMSettingPriority;
/*****************************************************************************/

18
src/libnm-core-public/nm-connection.h
View file

@ -122,15 +122,15 @@ NMSetting *nm_connection_get_setting_by_name(NMConnection *connection, const cha
* These flags determine which properties are serialized when calling
* nm_connection_to_dbus().
**/
typedef enum { /*< flags >*/
NM_CONNECTION_SERIALIZE_ALL = 0x00000000,
NM_CONNECTION_SERIALIZE_WITH_NON_SECRET = 0x00000001,
NM_CONNECTION_SERIALIZE_NO_SECRETS = 0x00000001,
NM_CONNECTION_SERIALIZE_WITH_SECRETS = 0x00000002,
NM_CONNECTION_SERIALIZE_ONLY_SECRETS = 0x00000002,
NM_CONNECTION_SERIALIZE_WITH_SECRETS_AGENT_OWNED = 0x00000004,
NM_CONNECTION_SERIALIZE_WITH_SECRETS_SYSTEM_OWNED = 0x00000008,
NM_CONNECTION_SERIALIZE_WITH_SECRETS_NOT_SAVED = 0x00000010,
typedef enum /*< flags >*/ {
NM_CONNECTION_SERIALIZE_ALL = 0x00000000,
NM_CONNECTION_SERIALIZE_WITH_NON_SECRET = 0x00000001,
NM_CONNECTION_SERIALIZE_NO_SECRETS = 0x00000001,
NM_CONNECTION_SERIALIZE_WITH_SECRETS = 0x00000002,
NM_CONNECTION_SERIALIZE_ONLY_SECRETS = 0x00000002,
NM_CONNECTION_SERIALIZE_WITH_SECRETS_AGENT_OWNED = 0x00000004,
NM_CONNECTION_SERIALIZE_WITH_SECRETS_SYSTEM_OWNED = 0x00000008,
NM_CONNECTION_SERIALIZE_WITH_SECRETS_NOT_SAVED = 0x00000010,
} NMConnectionSerializationFlags;
GVariant *nm_connection_to_dbus(NMConnection *connection, NMConnectionSerializationFlags flags);

238
src/libnm-core-public/nm-dbus-interface.h
View file

@ -265,12 +265,12 @@ typedef enum {
*
* General device capability flags.
**/
typedef enum { /*< flags >*/
NM_DEVICE_CAP_NONE = 0x00000000,
NM_DEVICE_CAP_NM_SUPPORTED = 0x00000001,
NM_DEVICE_CAP_CARRIER_DETECT = 0x00000002,
NM_DEVICE_CAP_IS_SOFTWARE = 0x00000004,
NM_DEVICE_CAP_SRIOV = 0x00000008,
typedef enum /*< flags >*/ {
NM_DEVICE_CAP_NONE = 0x00000000,
NM_DEVICE_CAP_NM_SUPPORTED = 0x00000001,
NM_DEVICE_CAP_CARRIER_DETECT = 0x00000002,
NM_DEVICE_CAP_IS_SOFTWARE = 0x00000004,
NM_DEVICE_CAP_SRIOV = 0x00000008,
} NMDeviceCapabilities;
/**
@ -292,21 +292,21 @@ typedef enum { /*< flags >*/
*
* 802.11 specific device encryption and authentication capabilities.
**/
typedef enum { /*< flags >*/
NM_WIFI_DEVICE_CAP_NONE = 0x00000000,
NM_WIFI_DEVICE_CAP_CIPHER_WEP40 = 0x00000001,
NM_WIFI_DEVICE_CAP_CIPHER_WEP104 = 0x00000002,
NM_WIFI_DEVICE_CAP_CIPHER_TKIP = 0x00000004,
NM_WIFI_DEVICE_CAP_CIPHER_CCMP = 0x00000008,
NM_WIFI_DEVICE_CAP_WPA = 0x00000010,
NM_WIFI_DEVICE_CAP_RSN = 0x00000020,
NM_WIFI_DEVICE_CAP_AP = 0x00000040,
NM_WIFI_DEVICE_CAP_ADHOC = 0x00000080,
NM_WIFI_DEVICE_CAP_FREQ_VALID = 0x00000100,
NM_WIFI_DEVICE_CAP_FREQ_2GHZ = 0x00000200,
NM_WIFI_DEVICE_CAP_FREQ_5GHZ = 0x00000400,
NM_WIFI_DEVICE_CAP_MESH = 0x00001000,
NM_WIFI_DEVICE_CAP_IBSS_RSN = 0x00002000,
typedef enum /*< flags >*/ {
NM_WIFI_DEVICE_CAP_NONE = 0x00000000,
NM_WIFI_DEVICE_CAP_CIPHER_WEP40 = 0x00000001,
NM_WIFI_DEVICE_CAP_CIPHER_WEP104 = 0x00000002,
NM_WIFI_DEVICE_CAP_CIPHER_TKIP = 0x00000004,
NM_WIFI_DEVICE_CAP_CIPHER_CCMP = 0x00000008,
NM_WIFI_DEVICE_CAP_WPA = 0x00000010,
NM_WIFI_DEVICE_CAP_RSN = 0x00000020,
NM_WIFI_DEVICE_CAP_AP = 0x00000040,
NM_WIFI_DEVICE_CAP_ADHOC = 0x00000080,
NM_WIFI_DEVICE_CAP_FREQ_VALID = 0x00000100,
NM_WIFI_DEVICE_CAP_FREQ_2GHZ = 0x00000200,
NM_WIFI_DEVICE_CAP_FREQ_5GHZ = 0x00000400,
NM_WIFI_DEVICE_CAP_MESH = 0x00001000,
NM_WIFI_DEVICE_CAP_IBSS_RSN = 0x00002000,
} NMDeviceWifiCapabilities;
/**
@ -320,12 +320,12 @@ typedef enum { /*< flags >*/
*
* 802.11 access point flags.
**/
typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/
NM_802_11_AP_FLAGS_NONE = 0x00000000,
NM_802_11_AP_FLAGS_PRIVACY = 0x00000001,
NM_802_11_AP_FLAGS_WPS = 0x00000002,
NM_802_11_AP_FLAGS_WPS_PBC = 0x00000004,
NM_802_11_AP_FLAGS_WPS_PIN = 0x00000008,
typedef enum /*< underscore_name=nm_802_11_ap_flags, flags >*/ {
NM_802_11_AP_FLAGS_NONE = 0x00000000,
NM_802_11_AP_FLAGS_PRIVACY = 0x00000001,
NM_802_11_AP_FLAGS_WPS = 0x00000002,
NM_802_11_AP_FLAGS_WPS_PBC = 0x00000004,
NM_802_11_AP_FLAGS_WPS_PIN = 0x00000008,
} NM80211ApFlags;
/**
@ -361,22 +361,22 @@ typedef enum { /*< underscore_name=nm_802_11_ap_flags, flags >*/
* the current security requirements of an access point as determined from the
* access point's beacon.
**/
typedef enum { /*< underscore_name=nm_802_11_ap_security_flags, flags >*/
NM_802_11_AP_SEC_NONE = 0x00000000,
NM_802_11_AP_SEC_PAIR_WEP40 = 0x00000001,
NM_802_11_AP_SEC_PAIR_WEP104 = 0x00000002,
NM_802_11_AP_SEC_PAIR_TKIP = 0x00000004,
NM_802_11_AP_SEC_PAIR_CCMP = 0x00000008,
NM_802_11_AP_SEC_GROUP_WEP40 = 0x00000010,
NM_802_11_AP_SEC_GROUP_WEP104 = 0x00000020,
NM_802_11_AP_SEC_GROUP_TKIP = 0x00000040,
NM_802_11_AP_SEC_GROUP_CCMP = 0x00000080,
NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x00000100,
NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x00000200,
NM_802_11_AP_SEC_KEY_MGMT_SAE = 0x00000400,
NM_802_11_AP_SEC_KEY_MGMT_OWE = 0x00000800,
NM_802_11_AP_SEC_KEY_MGMT_OWE_TM = 0x00001000,
NM_802_11_AP_SEC_KEY_MGMT_EAP_SUITE_B_192 = 0x00002000,
typedef enum /*< underscore_name=nm_802_11_ap_security_flags, flags >*/ {
NM_802_11_AP_SEC_NONE = 0x00000000,
NM_802_11_AP_SEC_PAIR_WEP40 = 0x00000001,
NM_802_11_AP_SEC_PAIR_WEP104 = 0x00000002,
NM_802_11_AP_SEC_PAIR_TKIP = 0x00000004,
NM_802_11_AP_SEC_PAIR_CCMP = 0x00000008,
NM_802_11_AP_SEC_GROUP_WEP40 = 0x00000010,
NM_802_11_AP_SEC_GROUP_WEP104 = 0x00000020,
NM_802_11_AP_SEC_GROUP_TKIP = 0x00000040,
NM_802_11_AP_SEC_GROUP_CCMP = 0x00000080,
NM_802_11_AP_SEC_KEY_MGMT_PSK = 0x00000100,
NM_802_11_AP_SEC_KEY_MGMT_802_1X = 0x00000200,
NM_802_11_AP_SEC_KEY_MGMT_SAE = 0x00000400,
NM_802_11_AP_SEC_KEY_MGMT_OWE = 0x00000800,
NM_802_11_AP_SEC_KEY_MGMT_OWE_TM = 0x00001000,
NM_802_11_AP_SEC_KEY_MGMT_EAP_SUITE_B_192 = 0x00002000,
} NM80211ApSecurityFlags;
/**
@ -412,10 +412,10 @@ typedef enum { /*< underscore_name=nm_802_11_mode >*/
* #NMBluetoothCapabilities values indicate the usable capabilities of a
* Bluetooth device.
**/
typedef enum { /*< flags >*/
NM_BT_CAPABILITY_NONE = 0x00000000,
NM_BT_CAPABILITY_DUN = 0x00000001,
NM_BT_CAPABILITY_NAP = 0x00000002,
typedef enum /*< flags >*/ {
NM_BT_CAPABILITY_NONE = 0x00000000,
NM_BT_CAPABILITY_DUN = 0x00000001,
NM_BT_CAPABILITY_NAP = 0x00000002,
} NMBluetoothCapabilities;
/**
@ -435,13 +435,13 @@ typedef enum { /*< flags >*/
* specific access technologies the device supports use the ModemManager D-Bus
* API.
**/
typedef enum { /*< flags >*/
NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000,
NM_DEVICE_MODEM_CAPABILITY_POTS = 0x00000001,
NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x00000002,
NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS = 0x00000004,
NM_DEVICE_MODEM_CAPABILITY_LTE = 0x00000008,
NM_DEVICE_MODEM_CAPABILITY_5GNR = 0x00000040,
typedef enum /*< flags >*/ {
NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000,
NM_DEVICE_MODEM_CAPABILITY_POTS = 0x00000001,
NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x00000002,
NM_DEVICE_MODEM_CAPABILITY_GSM_UMTS = 0x00000004,
NM_DEVICE_MODEM_CAPABILITY_LTE = 0x00000008,
NM_DEVICE_MODEM_CAPABILITY_5GNR = 0x00000040,
} NMDeviceModemCapabilities;
/* Note: the numeric values of NMDeviceModemCapabilities must be identical to the values
* in MMModemCapability. See the G_STATIC_ASSERT() in nm-modem-broadband.c's get_capabilities(). */
@ -834,16 +834,16 @@ typedef enum {
*
* #NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.
*/
typedef enum { /*< flags >*/
NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0,
NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1,
NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2,
NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 0x4,
NM_SECRET_AGENT_GET_SECRETS_FLAG_WPS_PBC_ACTIVE = 0x8,
typedef enum /*< flags >*/ {
NM_SECRET_AGENT_GET_SECRETS_FLAG_NONE = 0x0,
NM_SECRET_AGENT_GET_SECRETS_FLAG_ALLOW_INTERACTION = 0x1,
NM_SECRET_AGENT_GET_SECRETS_FLAG_REQUEST_NEW = 0x2,
NM_SECRET_AGENT_GET_SECRETS_FLAG_USER_REQUESTED = 0x4,
NM_SECRET_AGENT_GET_SECRETS_FLAG_WPS_PBC_ACTIVE = 0x8,
/* Internal to NM; not part of the D-Bus API */
NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM = 0x80000000,
NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS = 0x40000000,
/* Internal to NM; not part of the D-Bus API */
NM_SECRET_AGENT_GET_SECRETS_FLAG_ONLY_SYSTEM = 0x80000000,
NM_SECRET_AGENT_GET_SECRETS_FLAG_NO_ERRORS = 0x40000000,
} NMSecretAgentGetSecretsFlags;
/**
@ -964,12 +964,12 @@ typedef enum {
*
* Since: 1.4 (gi flags generated since 1.12)
*/
typedef enum { /*< flags >*/
NM_CHECKPOINT_CREATE_FLAG_NONE = 0,
NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL = 0x01,
NM_CHECKPOINT_CREATE_FLAG_DELETE_NEW_CONNECTIONS = 0x02,
NM_CHECKPOINT_CREATE_FLAG_DISCONNECT_NEW_DEVICES = 0x04,
NM_CHECKPOINT_CREATE_FLAG_ALLOW_OVERLAPPING = 0x08,
typedef enum /*< flags >*/ {
NM_CHECKPOINT_CREATE_FLAG_NONE = 0,
NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL = 0x01,
NM_CHECKPOINT_CREATE_FLAG_DELETE_NEW_CONNECTIONS = 0x02,
NM_CHECKPOINT_CREATE_FLAG_DISCONNECT_NEW_DEVICES = 0x04,
NM_CHECKPOINT_CREATE_FLAG_ALLOW_OVERLAPPING = 0x08,
} NMCheckpointCreateFlags;
/**
@ -983,11 +983,11 @@ typedef enum { /*< flags >*/
*
* Since: 1.4
**/
typedef enum { /*< skip >*/
NM_ROLLBACK_RESULT_OK = 0,
NM_ROLLBACK_RESULT_ERR_NO_DEVICE = 1,
NM_ROLLBACK_RESULT_ERR_DEVICE_UNMANAGED = 2,
NM_ROLLBACK_RESULT_ERR_FAILED = 3,
typedef enum /*< skip >*/ {
NM_ROLLBACK_RESULT_OK = 0,
NM_ROLLBACK_RESULT_ERR_NO_DEVICE = 1,
NM_ROLLBACK_RESULT_ERR_DEVICE_UNMANAGED = 2,
NM_ROLLBACK_RESULT_ERR_FAILED = 3,
} NMRollbackResult;
/**
@ -1013,12 +1013,12 @@ typedef enum { /*< skip >*/
*
* Since: 1.12
**/
typedef enum { /*< flags >*/
NM_SETTINGS_CONNECTION_FLAG_NONE = 0,
NM_SETTINGS_CONNECTION_FLAG_UNSAVED = 0x01,
NM_SETTINGS_CONNECTION_FLAG_NM_GENERATED = 0x02,
NM_SETTINGS_CONNECTION_FLAG_VOLATILE = 0x04,
NM_SETTINGS_CONNECTION_FLAG_EXTERNAL = 0x08,
typedef enum /*< flags >*/ {
NM_SETTINGS_CONNECTION_FLAG_NONE = 0,
NM_SETTINGS_CONNECTION_FLAG_UNSAVED = 0x01,
NM_SETTINGS_CONNECTION_FLAG_NM_GENERATED = 0x02,
NM_SETTINGS_CONNECTION_FLAG_VOLATILE = 0x04,
NM_SETTINGS_CONNECTION_FLAG_EXTERNAL = 0x08,
} NMSettingsConnectionFlags;
/**
@ -1042,17 +1042,17 @@ typedef enum { /*< flags >*/
*
* Since: 1.10
**/
typedef enum { /*< flags >*/
NM_ACTIVATION_STATE_FLAG_NONE = 0,
typedef enum /*< flags >*/ {
NM_ACTIVATION_STATE_FLAG_NONE = 0,
NM_ACTIVATION_STATE_FLAG_IS_MASTER = 0x1,
NM_ACTIVATION_STATE_FLAG_IS_SLAVE = 0x2,
NM_ACTIVATION_STATE_FLAG_LAYER2_READY = 0x4,
NM_ACTIVATION_STATE_FLAG_IP4_READY = 0x8,
NM_ACTIVATION_STATE_FLAG_IP6_READY = 0x10,
NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES = 0x20,
NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY = 0x40,
NM_ACTIVATION_STATE_FLAG_EXTERNAL = 0x80,
NM_ACTIVATION_STATE_FLAG_IS_MASTER = 0x1,
NM_ACTIVATION_STATE_FLAG_IS_SLAVE = 0x2,
NM_ACTIVATION_STATE_FLAG_LAYER2_READY = 0x4,
NM_ACTIVATION_STATE_FLAG_IP4_READY = 0x8,
NM_ACTIVATION_STATE_FLAG_IP6_READY = 0x10,
NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES = 0x20,
NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY = 0x40,
NM_ACTIVATION_STATE_FLAG_EXTERNAL = 0x80,
} NMActivationStateFlags;
/**
@ -1069,11 +1069,11 @@ typedef enum { /*< flags >*/
*
* Since: 1.20
*/
typedef enum { /*< flags >*/
NM_SETTINGS_ADD_CONNECTION2_FLAG_NONE = 0,
NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK = 0x1,
NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY = 0x2,
NM_SETTINGS_ADD_CONNECTION2_FLAG_BLOCK_AUTOCONNECT = 0x20,
typedef enum /*< flags >*/ {
NM_SETTINGS_ADD_CONNECTION2_FLAG_NONE = 0,
NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK = 0x1,
NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY = 0x2,
NM_SETTINGS_ADD_CONNECTION2_FLAG_BLOCK_AUTOCONNECT = 0x20,
} NMSettingsAddConnection2Flags;
/**
@ -1125,15 +1125,15 @@ typedef enum { /*< flags >*/
*
* Since: 1.12
*/
typedef enum { /*< flags >*/
NM_SETTINGS_UPDATE2_FLAG_NONE = 0,
NM_SETTINGS_UPDATE2_FLAG_TO_DISK = 0x1,
NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY = 0x2,
NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED = 0x4,
NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY = 0x8,
NM_SETTINGS_UPDATE2_FLAG_VOLATILE = 0x10,
NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT = 0x20,
NM_SETTINGS_UPDATE2_FLAG_NO_REAPPLY = 0x40,
typedef enum /*< flags >*/ {
NM_SETTINGS_UPDATE2_FLAG_NONE = 0,
NM_SETTINGS_UPDATE2_FLAG_TO_DISK = 0x1,
NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY = 0x2,
NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_DETACHED = 0x4,
NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY_ONLY = 0x8,
NM_SETTINGS_UPDATE2_FLAG_VOLATILE = 0x10,
NM_SETTINGS_UPDATE2_FLAG_BLOCK_AUTOCONNECT = 0x20,
NM_SETTINGS_UPDATE2_FLAG_NO_REAPPLY = 0x40,
} NMSettingsUpdate2Flags;
/**
@ -1172,12 +1172,12 @@ typedef enum {
*
* Since: 1.22
*/
typedef enum { /*< flags >*/
NM_MANAGER_RELOAD_FLAG_NONE = 0, /*< skip >*/
NM_MANAGER_RELOAD_FLAG_CONF = 0x1,
NM_MANAGER_RELOAD_FLAG_DNS_RC = 0x2,
NM_MANAGER_RELOAD_FLAG_DNS_FULL = 0x4,
NM_MANAGER_RELOAD_FLAG_ALL = 0x7, /*< skip >*/
typedef enum /*< flags >*/ {
NM_MANAGER_RELOAD_FLAG_NONE = 0, /*< skip >*/
NM_MANAGER_RELOAD_FLAG_CONF = 0x1,
NM_MANAGER_RELOAD_FLAG_DNS_RC = 0x2,
NM_MANAGER_RELOAD_FLAG_DNS_FULL = 0x4,
NM_MANAGER_RELOAD_FLAG_ALL = 0x7, /*< skip >*/
} NMManagerReloadFlags;
/**
@ -1199,15 +1199,15 @@ typedef enum { /*< flags >*/
*
* Since: 1.22
*/
typedef enum { /*< flags >*/
/* kernel flags */
NM_DEVICE_INTERFACE_FLAG_NONE = 0, /*< skip >*/
NM_DEVICE_INTERFACE_FLAG_UP = 0x1,
NM_DEVICE_INTERFACE_FLAG_LOWER_UP = 0x2,
NM_DEVICE_INTERFACE_FLAG_PROMISC = 0x4,
/* NM-specific flags */
NM_DEVICE_INTERFACE_FLAG_CARRIER = 0x10000,
NM_DEVICE_INTERFACE_FLAG_LLDP_CLIENT_ENABLED = 0x20000,
typedef enum /*< flags >*/ {
/* kernel flags */
NM_DEVICE_INTERFACE_FLAG_NONE = 0, /*< skip >*/
NM_DEVICE_INTERFACE_FLAG_UP = 0x1,
NM_DEVICE_INTERFACE_FLAG_LOWER_UP = 0x2,
NM_DEVICE_INTERFACE_FLAG_PROMISC = 0x4,
/* NM-specific flags */
NM_DEVICE_INTERFACE_FLAG_CARRIER = 0x10000,
NM_DEVICE_INTERFACE_FLAG_LLDP_CLIENT_ENABLED = 0x20000,
} NMDeviceInterfaceFlags;
/**

4
src/libnm-core-public/nm-keyfile.h
View file

@ -21,8 +21,8 @@ G_BEGIN_DECLS
*
* Since: 1.30
*/
typedef enum { /*< flags >*/
NM_KEYFILE_HANDLER_FLAGS_NONE = 0,
typedef enum /*< flags >*/ {
NM_KEYFILE_HANDLER_FLAGS_NONE = 0,
} NMKeyfileHandlerFlags;
/**

12
src/libnm-core-public/nm-setting-8021x.h
View file

@ -75,13 +75,13 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
*
* Since: 1.8
*/
typedef enum { /*< flags, underscore_name=nm_setting_802_1x_auth_flags >*/
NM_SETTING_802_1X_AUTH_FLAGS_NONE = 0,
NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_0_DISABLE = 0x1,
NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_1_DISABLE = 0x2,
NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_2_DISABLE = 0x4,
typedef enum /*< underscore_name=nm_setting_802_1x_auth_flags, flags >*/ {
NM_SETTING_802_1X_AUTH_FLAGS_NONE = 0,
NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_0_DISABLE = 0x1,
NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_1_DISABLE = 0x2,
NM_SETTING_802_1X_AUTH_FLAGS_TLS_1_2_DISABLE = 0x4,
NM_SETTING_802_1X_AUTH_FLAGS_ALL = 0x7,
NM_SETTING_802_1X_AUTH_FLAGS_ALL = 0x7,
} NMSetting8021xAuthFlags;
#define NM_TYPE_SETTING_802_1X (nm_setting_802_1x_get_type())

10
src/libnm-core-public/nm-setting-dcb.h
View file

@ -35,11 +35,11 @@ G_BEGIN_DECLS
*
* DCB feature flags.
**/
typedef enum { /*< flags >*/
NM_SETTING_DCB_FLAG_NONE = 0x00000000,
NM_SETTING_DCB_FLAG_ENABLE = 0x00000001,
NM_SETTING_DCB_FLAG_ADVERTISE = 0x00000002,
NM_SETTING_DCB_FLAG_WILLING = 0x00000004
typedef enum /*< flags >*/ {
NM_SETTING_DCB_FLAG_NONE = 0x00000000,
NM_SETTING_DCB_FLAG_ENABLE = 0x00000001,
NM_SETTING_DCB_FLAG_ADVERTISE = 0x00000002,
NM_SETTING_DCB_FLAG_WILLING = 0x00000004
} NMSettingDcbFlags;
/**

34
src/libnm-core-public/nm-setting-ip-config.h
View file

@ -31,9 +31,9 @@ G_BEGIN_DECLS
*
* Since: 1.22
*/
typedef enum { /*< flags >*/
NM_IP_ADDRESS_CMP_FLAGS_NONE = 0,
NM_IP_ADDRESS_CMP_FLAGS_WITH_ATTRS = 0x1,
typedef enum /*< flags >*/ {
NM_IP_ADDRESS_CMP_FLAGS_NONE = 0,
NM_IP_ADDRESS_CMP_FLAGS_WITH_ATTRS = 0x1,
} NMIPAddressCmpFlags;
typedef struct NMIPAddress NMIPAddress;
@ -86,9 +86,9 @@ void nm_ip_route_ref(NMIPRoute *route);
void nm_ip_route_unref(NMIPRoute *route);
gboolean nm_ip_route_equal(NMIPRoute *route, NMIPRoute *other);
enum { /*< flags >*/
NM_IP_ROUTE_EQUAL_CMP_FLAGS_NONE = 0,
NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS = 0x1,
enum /*< flags >*/ {
NM_IP_ROUTE_EQUAL_CMP_FLAGS_NONE = 0,
NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS = 0x1,
};
NM_AVAILABLE_IN_1_10
@ -277,12 +277,12 @@ gboolean nm_ip_routing_rule_validate(const NMIPRoutingRule *self, GError **error
*
* Since: 1.18
*/
typedef enum { /*< flags >*/
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE = 0,
typedef enum /*< flags >*/ {
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE = 0,
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET = 0x1,
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6 = 0x2,
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE = 0x4,
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET = 0x1,
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET6 = 0x2,
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_VALIDATE = 0x4,
} NMIPRoutingRuleAsStringFlags;
NM_AVAILABLE_IN_1_18
@ -386,14 +386,14 @@ typedef struct _NMSettingIPConfigClass NMSettingIPConfigClass;
*
* Since: 1.22
*/
typedef enum { /*< flags >*/
NM_DHCP_HOSTNAME_FLAG_NONE = 0x0,
typedef enum /*< flags >*/ {
NM_DHCP_HOSTNAME_FLAG_NONE = 0x0,
NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE = 0x1,
NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED = 0x2,
NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE = 0x4,
NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE = 0x1,
NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED = 0x2,
NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE = 0x4,
NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS = 0x8,
NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS = 0x8,
} NMDhcpHostnameFlags;

16
src/libnm-core-public/nm-setting-ip-tunnel.h
View file

@ -60,14 +60,14 @@ typedef struct _NMSettingIPTunnelClass NMSettingIPTunnelClass;
*
* Since: 1.12
*/
typedef enum { /*< flags, prefix=NM_IP_TUNNEL_FLAG >*/
NM_IP_TUNNEL_FLAG_NONE = 0x0,
NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT = 0x1,
NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS = 0x2,
NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL = 0x4,
NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV = 0x8,
NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY = 0x10,
NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK = 0x20,
typedef enum /*< prefix=NM_IP_TUNNEL_FLAG, flags >*/ {
NM_IP_TUNNEL_FLAG_NONE = 0x0,
NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT = 0x1,
NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS = 0x2,
NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL = 0x4,
NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV = 0x8,
NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY = 0x10,
NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK = 0x20,
} NMIPTunnelFlags;
NM_AVAILABLE_IN_1_2

10
src/libnm-core-public/nm-setting-team.h
View file

@ -26,11 +26,11 @@ G_BEGIN_DECLS
* @NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS: the arp_ping link watcher option
* 'send_always' is enabled (set to true).
*/
typedef enum { /*< flags >*/
NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE = 0, /*< skip >*/
NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE = 0x2,
NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE = 0x4,
NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS = 0x8,
typedef enum /*< flags >*/ {
NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_NONE = 0, /*< skip >*/
NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_ACTIVE = 0x2,
NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_VALIDATE_INACTIVE = 0x4,
NM_TEAM_LINK_WATCHER_ARP_PING_FLAG_SEND_ALWAYS = 0x8,
} NMTeamLinkWatcherArpPingFlags;
#define NM_TEAM_LINK_WATCHER_ETHTOOL "ethtool"

16
src/libnm-core-public/nm-setting-vlan.h
View file

@ -63,17 +63,17 @@ typedef enum {
*
* #NMVlanFlags values control the behavior of the VLAN interface.
**/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_VLAN_FLAG_REORDER_HEADERS = 0x1,
NM_VLAN_FLAG_GVRP = 0x2,
NM_VLAN_FLAG_LOOSE_BINDING = 0x4,
NM_VLAN_FLAG_MVRP = 0x8,
NM_VLAN_FLAG_REORDER_HEADERS = 0x1,
NM_VLAN_FLAG_GVRP = 0x2,
NM_VLAN_FLAG_LOOSE_BINDING = 0x4,
NM_VLAN_FLAG_MVRP = 0x8,
/* NOTE: if adding flags update nm-setting-vlan.c::verify() */
/* NOTE: if adding flags update nm-setting-vlan.c::verify() */
/* NOTE: these flags must correspond to the value from the kernel
* header files. */
/* NOTE: these flags must correspond to the value from the kernel
* header files. */
} NMVlanFlags;
#define NM_VLAN_FLAGS_ALL \

24
src/libnm-core-public/nm-setting-wired.h
View file

@ -49,20 +49,20 @@ G_BEGIN_DECLS
*
* Since: 1.2
*/
typedef enum { /*< flags >*/
NM_SETTING_WIRED_WAKE_ON_LAN_NONE = 0, /*< skip >*/
NM_SETTING_WIRED_WAKE_ON_LAN_PHY = 0x2,
NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST = 0x4,
NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST = 0x8,
NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST = 0x10,
NM_SETTING_WIRED_WAKE_ON_LAN_ARP = 0x20,
NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC = 0x40,
typedef enum /*< flags >*/ {
NM_SETTING_WIRED_WAKE_ON_LAN_NONE = 0, /*< skip >*/
NM_SETTING_WIRED_WAKE_ON_LAN_PHY = 0x2,
NM_SETTING_WIRED_WAKE_ON_LAN_UNICAST = 0x4,
NM_SETTING_WIRED_WAKE_ON_LAN_MULTICAST = 0x8,
NM_SETTING_WIRED_WAKE_ON_LAN_BROADCAST = 0x10,
NM_SETTING_WIRED_WAKE_ON_LAN_ARP = 0x20,
NM_SETTING_WIRED_WAKE_ON_LAN_MAGIC = 0x40,
NM_SETTING_WIRED_WAKE_ON_LAN_ALL = 0x7E, /*< skip >*/
NM_SETTING_WIRED_WAKE_ON_LAN_ALL = 0x7E, /*< skip >*/
NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT = 0x1,
NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE = 0x8000,
NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS = 0x8001, /*< skip >*/
NM_SETTING_WIRED_WAKE_ON_LAN_DEFAULT = 0x1,
NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE = 0x8000,
NM_SETTING_WIRED_WAKE_ON_LAN_EXCLUSIVE_FLAGS = 0x8001, /*< skip >*/
} NMSettingWiredWakeOnLan;
#define NM_SETTING_WIRED_PORT "port"

12
src/libnm-core-public/nm-setting-wireless-security.h
View file

@ -99,12 +99,12 @@ typedef enum {
*
* Since: 1.10
**/
typedef enum { /*< flags >*/
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT = 0x00000000,
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DISABLED = 0x00000001,
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_AUTO = 0x00000002,
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_PBC = 0x00000004,
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_PIN = 0x00000008,
typedef enum /*< flags >*/ {
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DEFAULT = 0x00000000,
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_DISABLED = 0x00000001,
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_AUTO = 0x00000002,
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_PBC = 0x00000004,
NM_SETTING_WIRELESS_SECURITY_WPS_METHOD_PIN = 0x00000008,
} NMSettingWirelessSecurityWpsMethod;
/**

2
src/libnm-core-public/nm-setting-wireless.h
View file

@ -53,7 +53,7 @@ G_BEGIN_DECLS
* Since: 1.12
*/
/* clang-format off */
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_SETTING_WIRELESS_WAKE_ON_WLAN_NONE = 0, /*< skip >*/
NM_SETTING_WIRELESS_WAKE_ON_WLAN_ANY = 0x2,
NM_SETTING_WIRELESS_WAKE_ON_WLAN_DISCONNECT = 0x4,

12
src/libnm-core-public/nm-setting.h
View file

@ -57,13 +57,13 @@ G_BEGIN_DECLS
* is to be stored and/or requested when it is needed.
*
**/
typedef enum { /*< flags >*/
NM_SETTING_SECRET_FLAG_NONE = 0x00000000,
NM_SETTING_SECRET_FLAG_AGENT_OWNED = 0x00000001,
NM_SETTING_SECRET_FLAG_NOT_SAVED = 0x00000002,
NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
typedef enum /*< flags >*/ {
NM_SETTING_SECRET_FLAG_NONE = 0x00000000,
NM_SETTING_SECRET_FLAG_AGENT_OWNED = 0x00000001,
NM_SETTING_SECRET_FLAG_NOT_SAVED = 0x00000002,
NM_SETTING_SECRET_FLAG_NOT_REQUIRED = 0x00000004
/* NOTE: if adding flags, update nm-core-internal.h as well */
/* NOTE: if adding flags, update nm-core-internal.h as well */
} NMSettingSecretFlags;
/**

18
src/libnmc-setting/nm-meta-setting-base-impl.h
View file

@ -38,15 +38,15 @@
*
* 10: NMSettingUser
*/
typedef enum { /*< skip >*/
NM_SETTING_PRIORITY_INVALID = 0,
NM_SETTING_PRIORITY_CONNECTION = 1,
NM_SETTING_PRIORITY_HW_BASE = 2,
NM_SETTING_PRIORITY_HW_NON_BASE = 3,
NM_SETTING_PRIORITY_HW_AUX = 4,
NM_SETTING_PRIORITY_AUX = 5,
NM_SETTING_PRIORITY_IP = 6,
NM_SETTING_PRIORITY_USER = 10,
typedef enum /*< skip >*/ {
NM_SETTING_PRIORITY_INVALID = 0,
NM_SETTING_PRIORITY_CONNECTION = 1,
NM_SETTING_PRIORITY_HW_BASE = 2,
NM_SETTING_PRIORITY_HW_NON_BASE = 3,
NM_SETTING_PRIORITY_HW_AUX = 4,
NM_SETTING_PRIORITY_AUX = 5,
NM_SETTING_PRIORITY_IP = 6,
NM_SETTING_PRIORITY_USER = 10,
} NMSettingPriority;
/*****************************************************************************/