colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests 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
19 changed files with 240 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/contrib/nm-vpn-editor-plugin-call.h
View File

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

2
src/libnm-client-public/nm-client.h
View File

@@ -27,7 +27,7 @@ G_BEGIN_DECLS
*
* Since: 1.24
*/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_CLIENT_INSTANCE_FLAGS_NONE = 0,
NM_CLIENT_INSTANCE_FLAGS_NO_AUTO_FETCH_PERMISSIONS = 1,
} NMClientInstanceFlags;

2
src/libnm-core-impl/tests/test-general-enums.h
View File

@@ -25,7 +25,7 @@ typedef enum {
NM_TEST_GENERAL_META_FLAGS_0x4 = (1 << 4),
} NMTestGeneralMetaFlags;
typedef enum { /*< flags >*/
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,

2
src/libnm-core-intern/nm-core-internal.h
View File

@@ -189,7 +189,7 @@ NM_TERNARY_TO_OPTION_BOOL(NMTernary v)
NMSetting **_nm_connection_get_settings_arr(NMConnection *connection);
typedef enum { /*< skip >*/
typedef enum /*< skip >*/ {
NM_SETTING_PARSE_FLAGS_NONE = 0,
NM_SETTING_PARSE_FLAGS_STRICT = 1LL << 0,
NM_SETTING_PARSE_FLAGS_BEST_EFFORT = 1LL << 1,

2
src/libnm-core-intern/nm-meta-setting-base-impl.h
View File

@@ -38,7 +38,7 @@
*
* 10: NMSettingUser
*/
typedef enum { /*< skip >*/
typedef enum /*< skip >*/ {
NM_SETTING_PRIORITY_INVALID = 0,
NM_SETTING_PRIORITY_CONNECTION = 1,
NM_SETTING_PRIORITY_HW_BASE = 2,

2
src/libnm-core-public/nm-connection.h
View File

@@ -122,7 +122,7 @@ 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 >*/
typedef enum /*< flags >*/ {
NM_CONNECTION_SERIALIZE_ALL = 0x00000000,
NM_CONNECTION_SERIALIZE_WITH_NON_SECRET = 0x00000001,
NM_CONNECTION_SERIALIZE_NO_SECRETS = 0x00000001,

30
src/libnm-core-public/nm-dbus-interface.h
View File

@@ -265,7 +265,7 @@ typedef enum {
*
* General device capability flags.
**/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_DEVICE_CAP_NONE = 0x00000000,
NM_DEVICE_CAP_NM_SUPPORTED = 0x00000001,
NM_DEVICE_CAP_CARRIER_DETECT = 0x00000002,
@@ -292,7 +292,7 @@ typedef enum { /*< flags >*/
*
* 802.11 specific device encryption and authentication capabilities.
**/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_WIFI_DEVICE_CAP_NONE = 0x00000000,
NM_WIFI_DEVICE_CAP_CIPHER_WEP40 = 0x00000001,
NM_WIFI_DEVICE_CAP_CIPHER_WEP104 = 0x00000002,
@@ -320,7 +320,7 @@ typedef enum { /*< flags >*/
*
* 802.11 access point flags.
**/
typedef enum { /*< underscore_name=nm_802_11_ap_flags, 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,
@@ -361,7 +361,7 @@ 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 >*/
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,
@@ -412,7 +412,7 @@ typedef enum { /*< underscore_name=nm_802_11_mode >*/
* #NMBluetoothCapabilities values indicate the usable capabilities of a
* Bluetooth device.
**/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_BT_CAPABILITY_NONE = 0x00000000,
NM_BT_CAPABILITY_DUN = 0x00000001,
NM_BT_CAPABILITY_NAP = 0x00000002,
@@ -435,7 +435,7 @@ typedef enum { /*< flags >*/
* specific access technologies the device supports use the ModemManager D-Bus
* API.
**/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_DEVICE_MODEM_CAPABILITY_NONE = 0x00000000,
NM_DEVICE_MODEM_CAPABILITY_POTS = 0x00000001,
NM_DEVICE_MODEM_CAPABILITY_CDMA_EVDO = 0x00000002,
@@ -834,7 +834,7 @@ typedef enum {
*
* #NMSecretAgentGetSecretsFlags values modify the behavior of a GetSecrets request.
*/
typedef enum { /*< flags >*/
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,
@@ -964,7 +964,7 @@ typedef enum {
*
* Since: 1.4 (gi flags generated since 1.12)
*/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_CHECKPOINT_CREATE_FLAG_NONE = 0,
NM_CHECKPOINT_CREATE_FLAG_DESTROY_ALL = 0x01,
NM_CHECKPOINT_CREATE_FLAG_DELETE_NEW_CONNECTIONS = 0x02,
@@ -983,7 +983,7 @@ typedef enum { /*< flags >*/
*
* Since: 1.4
**/
typedef enum { /*< skip >*/
typedef enum /*< skip >*/ {
NM_ROLLBACK_RESULT_OK = 0,
NM_ROLLBACK_RESULT_ERR_NO_DEVICE = 1,
NM_ROLLBACK_RESULT_ERR_DEVICE_UNMANAGED = 2,
@@ -1013,7 +1013,7 @@ typedef enum { /*< skip >*/
*
* Since: 1.12
**/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_SETTINGS_CONNECTION_FLAG_NONE = 0,
NM_SETTINGS_CONNECTION_FLAG_UNSAVED = 0x01,
NM_SETTINGS_CONNECTION_FLAG_NM_GENERATED = 0x02,
@@ -1042,7 +1042,7 @@ typedef enum { /*< flags >*/
*
* Since: 1.10
**/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_ACTIVATION_STATE_FLAG_NONE = 0,
NM_ACTIVATION_STATE_FLAG_IS_MASTER = 0x1,
@@ -1069,7 +1069,7 @@ typedef enum { /*< flags >*/
*
* Since: 1.20
*/
typedef enum { /*< flags >*/
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,
@@ -1125,7 +1125,7 @@ typedef enum { /*< flags >*/
*
* Since: 1.12
*/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_SETTINGS_UPDATE2_FLAG_NONE = 0,
NM_SETTINGS_UPDATE2_FLAG_TO_DISK = 0x1,
NM_SETTINGS_UPDATE2_FLAG_IN_MEMORY = 0x2,
@@ -1172,7 +1172,7 @@ typedef enum {
*
* Since: 1.22
*/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_MANAGER_RELOAD_FLAG_NONE = 0, /*< skip >*/
NM_MANAGER_RELOAD_FLAG_CONF = 0x1,
NM_MANAGER_RELOAD_FLAG_DNS_RC = 0x2,
@@ -1199,7 +1199,7 @@ typedef enum { /*< flags >*/
*
* Since: 1.22
*/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
/* kernel flags */
NM_DEVICE_INTERFACE_FLAG_NONE = 0, /*< skip >*/
NM_DEVICE_INTERFACE_FLAG_UP = 0x1,

2
src/libnm-core-public/nm-keyfile.h
View File

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

2
src/libnm-core-public/nm-setting-8021x.h
View File

@@ -75,7 +75,7 @@ typedef enum { /*< underscore_name=nm_setting_802_1x_ck_scheme >*/
*
* Since: 1.8
*/
typedef enum { /*< flags, underscore_name=nm_setting_802_1x_auth_flags >*/
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,

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

@@ -35,7 +35,7 @@ G_BEGIN_DECLS
*
* DCB feature flags.
**/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_SETTING_DCB_FLAG_NONE = 0x00000000,
NM_SETTING_DCB_FLAG_ENABLE = 0x00000001,
NM_SETTING_DCB_FLAG_ADVERTISE = 0x00000002,

8
src/libnm-core-public/nm-setting-ip-config.h
View File

@@ -31,7 +31,7 @@ G_BEGIN_DECLS
*
* Since: 1.22
*/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_IP_ADDRESS_CMP_FLAGS_NONE = 0,
NM_IP_ADDRESS_CMP_FLAGS_WITH_ATTRS = 0x1,
} NMIPAddressCmpFlags;
@@ -86,7 +86,7 @@ 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 >*/
enum /*< flags >*/ {
NM_IP_ROUTE_EQUAL_CMP_FLAGS_NONE = 0,
NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS = 0x1,
};
@@ -277,7 +277,7 @@ gboolean nm_ip_routing_rule_validate(const NMIPRoutingRule *self, GError **error
*
* Since: 1.18
*/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_NONE = 0,
NM_IP_ROUTING_RULE_AS_STRING_FLAGS_AF_INET = 0x1,
@@ -386,7 +386,7 @@ typedef struct _NMSettingIPConfigClass NMSettingIPConfigClass;
*
* Since: 1.22
*/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_DHCP_HOSTNAME_FLAG_NONE = 0x0,
NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE = 0x1,

2
src/libnm-core-public/nm-setting-ip-tunnel.h
View File

@@ -60,7 +60,7 @@ typedef struct _NMSettingIPTunnelClass NMSettingIPTunnelClass;
*
* Since: 1.12
*/
typedef enum { /*< flags, prefix=NM_IP_TUNNEL_FLAG >*/
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,

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

@@ -26,7 +26,7 @@ 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 >*/
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,

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

@@ -63,7 +63,7 @@ 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,

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

@@ -49,7 +49,7 @@ G_BEGIN_DECLS
*
* Since: 1.2
*/
typedef enum { /*< flags >*/
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,

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

@@ -99,7 +99,7 @@ typedef enum {
*
* Since: 1.10
**/
typedef enum { /*< flags >*/
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,

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,

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

@@ -57,7 +57,7 @@ G_BEGIN_DECLS
* is to be stored and/or requested when it is needed.
*
**/
typedef enum { /*< flags >*/
typedef enum /*< flags >*/ {
NM_SETTING_SECRET_FLAG_NONE = 0x00000000,
NM_SETTING_SECRET_FLAG_AGENT_OWNED = 0x00000001,
NM_SETTING_SECRET_FLAG_NOT_SAVED = 0x00000002,

2
src/libnmc-setting/nm-meta-setting-base-impl.h
View File

@@ -38,7 +38,7 @@
*
* 10: NMSettingUser
*/
typedef enum { /*< skip >*/
typedef enum /*< skip >*/ {
NM_SETTING_PRIORITY_INVALID = 0,
NM_SETTING_PRIORITY_CONNECTION = 1,
NM_SETTING_PRIORITY_HW_BASE = 2,