fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 03:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rdisc/trivial: rename NMLNDPRDisc to NMLndpRDisc

Browse source 
For abbreviations that have more then 2 characters, we prefer to use lower-case.
For example, NMVpnManager.
This commit is contained in:
Thomas Haller 2016-07-06 11:22:00 +02:00
parent 10c5352855
commit bb3f73655a
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/rdisc/nm-lndp-rdisc.c
View file

@ -41,18 +41,18 @@ typedef struct {
GIOChannel *event_channel; GIOChannel *event_channel;
guint event_id; guint event_id;
guint ra_timeout_id; /* first RA timeout */ guint ra_timeout_id; /* first RA timeout */
} NMLNDPRDiscPrivate; } NMLndpRDiscPrivate;
#define NM_LNDP_RDISC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_LNDP_RDISC, NMLNDPRDiscPrivate)) #define NM_LNDP_RDISC_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_LNDP_RDISC, NMLndpRDiscPrivate))
G_DEFINE_TYPE (NMLNDPRDisc, nm_lndp_rdisc, NM_TYPE_RDISC) G_DEFINE_TYPE (NMLndpRDisc, nm_lndp_rdisc, NM_TYPE_RDISC)
/******************************************************************/ /******************************************************************/
static gboolean static gboolean
send_rs (NMRDisc *rdisc, GError **error) send_rs (NMRDisc *rdisc, GError **error)
{ {
NMLNDPRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc); NMLndpRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc);
struct ndp_msg *msg; struct ndp_msg *msg;
int errsv; int errsv;
@ -283,7 +283,7 @@ static gboolean
event_ready (GIOChannel *source, GIOCondition condition, NMRDisc *rdisc) event_ready (GIOChannel *source, GIOCondition condition, NMRDisc *rdisc)
{ {
nm_auto_pop_netns NMPNetns *netns = NULL; nm_auto_pop_netns NMPNetns *netns = NULL;
NMLNDPRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc); NMLndpRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc);
_LOGD ("processing libndp events"); _LOGD ("processing libndp events");
@ -297,7 +297,7 @@ event_ready (GIOChannel *source, GIOCondition condition, NMRDisc *rdisc)
static void static void
start (NMRDisc *rdisc) start (NMRDisc *rdisc)
{ {
NMLNDPRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc); NMLndpRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc);
int fd = ndp_get_eventfd (priv->ndp); int fd = ndp_get_eventfd (priv->ndp);
priv->event_channel = g_io_channel_unix_new (fd); priv->event_channel = g_io_channel_unix_new (fd);
@ -328,7 +328,7 @@ nm_lndp_rdisc_new (NMPlatform *platform,
{ {
nm_auto_pop_netns NMPNetns *netns = NULL; nm_auto_pop_netns NMPNetns *netns = NULL;
NMRDisc *rdisc; NMRDisc *rdisc;
NMLNDPRDiscPrivate *priv; NMLndpRDiscPrivate *priv;
int errsv; int errsv;
g_return_val_if_fail (NM_IS_PLATFORM (platform), NULL); g_return_val_if_fail (NM_IS_PLATFORM (platform), NULL);
@ -370,15 +370,15 @@ nm_lndp_rdisc_new (NMPlatform *platform,
} }
static void static void
nm_lndp_rdisc_init (NMLNDPRDisc *lndp_rdisc) nm_lndp_rdisc_init (NMLndpRDisc *lndp_rdisc)
{ {
} }
static void static void
dispose (GObject *object) dispose (GObject *object)
{ {
NMLNDPRDisc *rdisc = NM_LNDP_RDISC (object); NMLndpRDisc *rdisc = NM_LNDP_RDISC (object);
NMLNDPRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc); NMLndpRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc);
nm_clear_g_source (&priv->event_id); nm_clear_g_source (&priv->event_id);
g_clear_pointer (&priv->event_channel, g_io_channel_unref); g_clear_pointer (&priv->event_channel, g_io_channel_unref);
@ -393,12 +393,12 @@ dispose (GObject *object)
} }
static void static void
nm_lndp_rdisc_class_init (NMLNDPRDiscClass *klass) nm_lndp_rdisc_class_init (NMLndpRDiscClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
NMRDiscClass *rdisc_class = NM_RDISC_CLASS (klass); NMRDiscClass *rdisc_class = NM_RDISC_CLASS (klass);
g_type_class_add_private (klass, sizeof (NMLNDPRDiscPrivate)); g_type_class_add_private (klass, sizeof (NMLndpRDiscPrivate));
object_class->dispose = dispose; object_class->dispose = dispose;
rdisc_class->start = start; rdisc_class->start = start;

10
src/rdisc/nm-lndp-rdisc.h
View file

@ -25,21 +25,21 @@
#include "nm-core-utils.h" #include "nm-core-utils.h"
#define NM_TYPE_LNDP_RDISC (nm_lndp_rdisc_get_type ()) #define NM_TYPE_LNDP_RDISC (nm_lndp_rdisc_get_type ())
#define NM_LNDP_RDISC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_LNDP_RDISC, NMLNDPRDisc)) #define NM_LNDP_RDISC(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_LNDP_RDISC, NMLndpRDisc))
#define NM_LNDP_RDISC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_LNDP_RDISC, NMLNDPRDiscClass)) #define NM_LNDP_RDISC_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_LNDP_RDISC, NMLndpRDiscClass))
#define NM_IS_LNDP_RDISC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_LNDP_RDISC)) #define NM_IS_LNDP_RDISC(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), NM_TYPE_LNDP_RDISC))
#define NM_IS_LNDP_RDISC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_LNDP_RDISC)) #define NM_IS_LNDP_RDISC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), NM_TYPE_LNDP_RDISC))
#define NM_LNDP_RDISC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_LNDP_RDISC, NMLNDPRDiscClass)) #define NM_LNDP_RDISC_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), NM_TYPE_LNDP_RDISC, NMLndpRDiscClass))
/******************************************************************/ /******************************************************************/
typedef struct { typedef struct {
NMRDisc parent; NMRDisc parent;
} NMLNDPRDisc; } NMLndpRDisc;
typedef struct { typedef struct {
NMRDiscClass parent; NMRDiscClass parent;
} NMLNDPRDiscClass; } NMLndpRDiscClass;
/******************************************************************/ /******************************************************************/