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

all: drop /*<skip>*/ annotations for enums

Browse Source 
We don't run glib-mkenums for certain sources like "core" and
"libnm-glib-aux".

These annotations have no effect. Drop them.
They also mess with the automated formatting.
This commit is contained in:
Thomas Haller
2022-02-02 12:12:12 +01:00
parent e23ebe9183
commit a2c4f071e4
6 changed files with 113 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/core/devices/nm-device.h
View File

@@ -105,38 +105,38 @@ typedef enum NMActStageReturn NMActStageReturn;
* a condition, so that adding a flag might make a connection available that would * a condition, so that adding a flag might make a connection available that would
* not be available otherwise. Adding a flag should never make a connection * not be available otherwise. Adding a flag should never make a connection
* not available if it would be available otherwise. */ * not available if it would be available otherwise. */
typedef enum { /*< skip >*/ typedef enum {
NM_DEVICE_CHECK_CON_AVAILABLE_NONE = 0, NM_DEVICE_CHECK_CON_AVAILABLE_NONE = 0,
/* since NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST is a collection of flags with more fine grained /* since NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST is a collection of flags with more fine grained
* parts, this flag in general indicates that this is a user-request. */ * parts, this flag in general indicates that this is a user-request. */
_NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST = (1L << 0), _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST = (1L << 0),
/* we also consider devices which have no carrier but are still waiting for the driver /* we also consider devices which have no carrier but are still waiting for the driver
* to detect carrier. Usually, such devices are not yet available, however for a user-request * to detect carrier. Usually, such devices are not yet available, however for a user-request
* they are. They might fail later if carrier doesn't come. */ * they are. They might fail later if carrier doesn't come. */
_NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER = (1L << 1), _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER = (1L << 1),
/* usually, a profile is only available if the Wi-Fi AP is in range. For an /* usually, a profile is only available if the Wi-Fi AP is in range. For an
* explicit user request, we also consider profiles for APs that are not (yet) * explicit user request, we also consider profiles for APs that are not (yet)
* visible. */ * visible. */
_NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP = (1L << 2), _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP = (1L << 2),
/* a device can be marked as unmanaged for various reasons. Some of these reasons /* a device can be marked as unmanaged for various reasons. Some of these reasons
* are authoritative, others not. Non-authoritative reasons can be overruled by * are authoritative, others not. Non-authoritative reasons can be overruled by
* `nmcli device set $DEVICE managed yes`. Also, for an explicit user activation * `nmcli device set $DEVICE managed yes`. Also, for an explicit user activation
* request we may want to consider the device as managed. This flag makes devices * request we may want to consider the device as managed. This flag makes devices
* that are unmanaged appear available. */ * that are unmanaged appear available. */
_NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_OVERRULE_UNMANAGED = (1L << 3), _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_OVERRULE_UNMANAGED = (1L << 3),
/* a collection of flags, that are commonly set for an explicit user-request. */ /* a collection of flags, that are commonly set for an explicit user-request. */
NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST = NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST =
_NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST
| _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER | _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER
| _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP | _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP
| _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_OVERRULE_UNMANAGED, | _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_OVERRULE_UNMANAGED,
NM_DEVICE_CHECK_CON_AVAILABLE_ALL = (1L << 4) - 1, NM_DEVICE_CHECK_CON_AVAILABLE_ALL = (1L << 4) - 1,
} NMDeviceCheckConAvailableFlags; } NMDeviceCheckConAvailableFlags;
struct _NMDevicePrivate; struct _NMDevicePrivate;
@@ -149,19 +149,18 @@ struct _NMDevice {
/* The flags have an relaxing meaning, that means, specifying more flags, can make /* The flags have an relaxing meaning, that means, specifying more flags, can make
* a device appear more available. It can never make a device less available. */ * a device appear more available. It can never make a device less available. */
typedef enum { /*< skip >*/ typedef enum {
NM_DEVICE_CHECK_DEV_AVAILABLE_NONE = 0, NM_DEVICE_CHECK_DEV_AVAILABLE_NONE = 0,
/* the device is considered available, even if it has no carrier. /* the device is considered available, even if it has no carrier.
* *
* For various device types (software devices) we ignore carrier based * For various device types (software devices) we ignore carrier based
* on the type. So, for them, this flag has no effect anyway. */ * on the type. So, for them, this flag has no effect anyway. */
_NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER = (1L << 0), _NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER = (1L << 0),
NM_DEVICE_CHECK_DEV_AVAILABLE_FOR_USER_REQUEST = NM_DEVICE_CHECK_DEV_AVAILABLE_FOR_USER_REQUEST = _NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER,
_NM_DEVICE_CHECK_DEV_AVAILABLE_IGNORE_CARRIER,
NM_DEVICE_CHECK_DEV_AVAILABLE_ALL = (1L << 1) - 1, NM_DEVICE_CHECK_DEV_AVAILABLE_ALL = (1L << 1) - 1,
} NMDeviceCheckDevAvailableFlags; } NMDeviceCheckDevAvailableFlags;
typedef void (*NMDeviceDeactivateCallback)(NMDevice *self, GError *error, gpointer user_data); typedef void (*NMDeviceDeactivateCallback)(NMDevice *self, GError *error, gpointer user_data);

20
src/core/nm-rfkill-manager.h
View File

@@ -7,22 +7,22 @@
#ifndef __NM_RFKILL_MANAGER_H__ #ifndef __NM_RFKILL_MANAGER_H__
#define __NM_RFKILL_MANAGER_H__ #define __NM_RFKILL_MANAGER_H__
typedef enum { /*< skip >*/ typedef enum {
RFKILL_UNBLOCKED = 0, RFKILL_UNBLOCKED = 0,
RFKILL_SOFT_BLOCKED = 1, RFKILL_SOFT_BLOCKED = 1,
RFKILL_HARD_BLOCKED = 2 RFKILL_HARD_BLOCKED = 2,
} RfKillState; } RfKillState;
typedef enum { /*< skip >*/ typedef enum {
RFKILL_TYPE_WLAN = 0, RFKILL_TYPE_WLAN = 0,
RFKILL_TYPE_WWAN = 1, RFKILL_TYPE_WWAN = 1,
/* UNKNOWN and MAX should always be 1 more than /* UNKNOWN and MAX should always be 1 more than
* the last rfkill type since RFKILL_TYPE_MAX is * the last rfkill type since RFKILL_TYPE_MAX is
* used as an array size. * used as an array size.
*/ */
RFKILL_TYPE_UNKNOWN, /* KEEP LAST */ RFKILL_TYPE_UNKNOWN, /* KEEP LAST */
RFKILL_TYPE_MAX = RFKILL_TYPE_UNKNOWN RFKILL_TYPE_MAX = RFKILL_TYPE_UNKNOWN,
} RfKillType; } RfKillType;
#define NM_TYPE_RFKILL_MANAGER (nm_rfkill_manager_get_type()) #define NM_TYPE_RFKILL_MANAGER (nm_rfkill_manager_get_type())

113
src/libnm-glib-aux/nm-logging-fwd.h
View File

@@ -9,54 +9,54 @@
/* Log domains */ /* Log domains */
typedef enum { /*< skip >*/ typedef enum {
LOGD_NONE = 0LL, LOGD_NONE = 0LL,
LOGD_PLATFORM = (1LL << 0), /* Platform services */ LOGD_PLATFORM = (1LL << 0), /* Platform services */
LOGD_RFKILL = (1LL << 1), LOGD_RFKILL = (1LL << 1),
LOGD_ETHER = (1LL << 2), LOGD_ETHER = (1LL << 2),
LOGD_WIFI = (1LL << 3), LOGD_WIFI = (1LL << 3),
LOGD_BT = (1LL << 4), LOGD_BT = (1LL << 4),
LOGD_MB = (1LL << 5), /* mobile broadband */ LOGD_MB = (1LL << 5), /* mobile broadband */
LOGD_DHCP4 = (1LL << 6), LOGD_DHCP4 = (1LL << 6),
LOGD_DHCP6 = (1LL << 7), LOGD_DHCP6 = (1LL << 7),
LOGD_PPP = (1LL << 8), LOGD_PPP = (1LL << 8),
LOGD_WIFI_SCAN = (1LL << 9), LOGD_WIFI_SCAN = (1LL << 9),
LOGD_IP4 = (1LL << 10), LOGD_IP4 = (1LL << 10),
LOGD_IP6 = (1LL << 11), LOGD_IP6 = (1LL << 11),
LOGD_AUTOIP4 = (1LL << 12), LOGD_AUTOIP4 = (1LL << 12),
LOGD_DNS = (1LL << 13), LOGD_DNS = (1LL << 13),
LOGD_VPN = (1LL << 14), LOGD_VPN = (1LL << 14),
LOGD_SHARING = (1LL << 15), /* Connection sharing/dnsmasq */ LOGD_SHARING = (1LL << 15), /* Connection sharing/dnsmasq */
LOGD_SUPPLICANT = (1LL << 16), /* Wi-Fi and 802.1x */ LOGD_SUPPLICANT = (1LL << 16), /* Wi-Fi and 802.1x */
LOGD_AGENTS = (1LL << 17), /* Secret agents */ LOGD_AGENTS = (1LL << 17), /* Secret agents */
LOGD_SETTINGS = (1LL << 18), /* Settings */ LOGD_SETTINGS = (1LL << 18), /* Settings */
LOGD_SUSPEND = (1LL << 19), /* Suspend/Resume */ LOGD_SUSPEND = (1LL << 19), /* Suspend/Resume */
LOGD_CORE = (1LL << 20), /* Core daemon and policy stuff */ LOGD_CORE = (1LL << 20), /* Core daemon and policy stuff */
LOGD_DEVICE = (1LL << 21), /* Device state and activation */ LOGD_DEVICE = (1LL << 21), /* Device state and activation */
LOGD_OLPC = (1LL << 22), LOGD_OLPC = (1LL << 22),
LOGD_INFINIBAND = (1LL << 23), LOGD_INFINIBAND = (1LL << 23),
LOGD_FIREWALL = (1LL << 24), LOGD_FIREWALL = (1LL << 24),
LOGD_ADSL = (1LL << 25), LOGD_ADSL = (1LL << 25),
LOGD_BOND = (1LL << 26), LOGD_BOND = (1LL << 26),
LOGD_VLAN = (1LL << 27), LOGD_VLAN = (1LL << 27),
LOGD_BRIDGE = (1LL << 28), LOGD_BRIDGE = (1LL << 28),
LOGD_DBUS_PROPS = (1LL << 29), LOGD_DBUS_PROPS = (1LL << 29),
LOGD_TEAM = (1LL << 30), LOGD_TEAM = (1LL << 30),
LOGD_CONCHECK = (1LL << 31), LOGD_CONCHECK = (1LL << 31),
LOGD_DCB = (1LL << 32), /* Data Center Bridging */ LOGD_DCB = (1LL << 32), /* Data Center Bridging */
LOGD_DISPATCH = (1LL << 33), LOGD_DISPATCH = (1LL << 33),
LOGD_AUDIT = (1LL << 34), LOGD_AUDIT = (1LL << 34),
LOGD_SYSTEMD = (1LL << 35), LOGD_SYSTEMD = (1LL << 35),
LOGD_VPN_PLUGIN = (1LL << 36), LOGD_VPN_PLUGIN = (1LL << 36),
LOGD_PROXY = (1LL << 37), LOGD_PROXY = (1LL << 37),
__LOGD_MAX, __LOGD_MAX,
LOGD_ALL = (((__LOGD_MAX - 1LL) << 1) - 1LL), LOGD_ALL = (((__LOGD_MAX - 1LL) << 1) - 1LL),
LOGD_DEFAULT = LOGD_ALL & ~(LOGD_DBUS_PROPS | LOGD_WIFI_SCAN | LOGD_VPN_PLUGIN | 0), LOGD_DEFAULT = LOGD_ALL & ~(LOGD_DBUS_PROPS | LOGD_WIFI_SCAN | LOGD_VPN_PLUGIN | 0),
/* aliases: */ /* aliases: */
LOGD_DHCP = LOGD_DHCP4 | LOGD_DHCP6, LOGD_DHCP = LOGD_DHCP4 | LOGD_DHCP6,
LOGD_IP = LOGD_IP4 | LOGD_IP6, LOGD_IP = LOGD_IP4 | LOGD_IP6,
#define LOGD_DHCPX(is_ipv4) ((is_ipv4) ? LOGD_DHCP4 : LOGD_DHCP6) #define LOGD_DHCPX(is_ipv4) ((is_ipv4) ? LOGD_DHCP4 : LOGD_DHCP6)
#define LOGD_IPX(is_ipv4) ((is_ipv4) ? LOGD_IP4 : LOGD_IP6) #define LOGD_IPX(is_ipv4) ((is_ipv4) ? LOGD_IP4 : LOGD_IP6)
@@ -64,19 +64,20 @@ typedef enum { /*< skip >*/
} NMLogDomain; } NMLogDomain;
/* Log levels */ /* Log levels */
typedef enum { /*< skip >*/ typedef enum {
LOGL_TRACE,
LOGL_DEBUG,
LOGL_INFO,
LOGL_WARN,
LOGL_ERR,
_LOGL_N_REAL, /* the number of actual logging levels */ LOGL_TRACE,
LOGL_DEBUG,
LOGL_INFO,
LOGL_WARN,
LOGL_ERR,
_LOGL_OFF = _LOGL_N_REAL, /* special logging level that is always disabled. */ _LOGL_N_REAL, /* the number of actual logging levels */
_LOGL_KEEP, /* special logging level to indicate that the logging level should not be changed. */
_LOGL_N, /* the number of logging levels including "OFF" */ _LOGL_OFF = _LOGL_N_REAL, /* special logging level that is always disabled. */
_LOGL_KEEP, /* special logging level to indicate that the logging level should not be changed. */
_LOGL_N, /* the number of logging levels including "OFF" */
} NMLogLevel; } NMLogLevel;
gboolean _nm_log_enabled_impl(gboolean mt_require_locking, NMLogLevel level, NMLogDomain domain); gboolean _nm_log_enabled_impl(gboolean mt_require_locking, NMLogLevel level, NMLogDomain domain);

22
src/libnm-platform/nm-platform.h
View File

@@ -259,17 +259,17 @@ struct _NMPlatformLink {
bool initialized : 1; bool initialized : 1;
}; };
typedef enum { /*< skip >*/ typedef enum {
NM_PLATFORM_SIGNAL_ID_NONE, NM_PLATFORM_SIGNAL_ID_NONE,
NM_PLATFORM_SIGNAL_ID_LINK, NM_PLATFORM_SIGNAL_ID_LINK,
NM_PLATFORM_SIGNAL_ID_IP4_ADDRESS, NM_PLATFORM_SIGNAL_ID_IP4_ADDRESS,
NM_PLATFORM_SIGNAL_ID_IP6_ADDRESS, NM_PLATFORM_SIGNAL_ID_IP6_ADDRESS,
NM_PLATFORM_SIGNAL_ID_IP4_ROUTE, NM_PLATFORM_SIGNAL_ID_IP4_ROUTE,
NM_PLATFORM_SIGNAL_ID_IP6_ROUTE, NM_PLATFORM_SIGNAL_ID_IP6_ROUTE,
NM_PLATFORM_SIGNAL_ID_ROUTING_RULE, NM_PLATFORM_SIGNAL_ID_ROUTING_RULE,
NM_PLATFORM_SIGNAL_ID_QDISC, NM_PLATFORM_SIGNAL_ID_QDISC,
NM_PLATFORM_SIGNAL_ID_TFILTER, NM_PLATFORM_SIGNAL_ID_TFILTER,
_NM_PLATFORM_SIGNAL_ID_LAST, _NM_PLATFORM_SIGNAL_ID_LAST,
} NMPlatformSignalIdType; } NMPlatformSignalIdType;
guint _nm_platform_signal_id_get(NMPlatformSignalIdType signal_type); guint _nm_platform_signal_id_get(NMPlatformSignalIdType signal_type);

18
src/libnm-platform/nmp-object.h
View File

@@ -91,17 +91,17 @@ typedef struct _NMPWireGuardPeer {
/*****************************************************************************/ /*****************************************************************************/
typedef enum { /*< skip >*/ typedef enum {
NMP_OBJECT_TO_STRING_ID, NMP_OBJECT_TO_STRING_ID,
NMP_OBJECT_TO_STRING_PUBLIC, NMP_OBJECT_TO_STRING_PUBLIC,
NMP_OBJECT_TO_STRING_ALL, NMP_OBJECT_TO_STRING_ALL,
} NMPObjectToStringMode; } NMPObjectToStringMode;
typedef enum { /*< skip >*/ typedef enum {
NMP_CACHE_OPS_UNCHANGED = NM_PLATFORM_SIGNAL_NONE, NMP_CACHE_OPS_UNCHANGED = NM_PLATFORM_SIGNAL_NONE,
NMP_CACHE_OPS_ADDED = NM_PLATFORM_SIGNAL_ADDED, NMP_CACHE_OPS_ADDED = NM_PLATFORM_SIGNAL_ADDED,
NMP_CACHE_OPS_UPDATED = NM_PLATFORM_SIGNAL_CHANGED, NMP_CACHE_OPS_UPDATED = NM_PLATFORM_SIGNAL_CHANGED,
NMP_CACHE_OPS_REMOVED = NM_PLATFORM_SIGNAL_REMOVED, NMP_CACHE_OPS_REMOVED = NM_PLATFORM_SIGNAL_REMOVED,
} NMPCacheOpsType; } NMPCacheOpsType;
/* The NMPCacheIdType are the different index types. /* The NMPCacheIdType are the different index types.

6
src/nmtui/nmt-mac-entry.h
View File

@@ -9,9 +9,9 @@
#include "nm-utils.h" #include "nm-utils.h"
#include "libnmt-newt/nmt-newt.h" #include "libnmt-newt/nmt-newt.h"
typedef enum { /*< skip >*/ typedef enum {
NMT_MAC_ENTRY_TYPE_MAC, NMT_MAC_ENTRY_TYPE_MAC,
NMT_MAC_ENTRY_TYPE_CLONED, NMT_MAC_ENTRY_TYPE_CLONED,
} NmtMacEntryType; } NmtMacEntryType;
#define NMT_TYPE_MAC_ENTRY (nmt_mac_entry_get_type()) #define NMT_TYPE_MAC_ENTRY (nmt_mac_entry_get_type())