diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-05-19 16:38:51 +0200 |
| commit | 96642ebde58e1eea692aea6a92d33f45452fa9c0 (patch) | |
| tree | 106ddfa2180b3997e8965787b5cb122982ebab9d /src/ppp | |
| parent | 8f6881ac06714ef99cc470a03e7ac0ce1af49a16 (diff) | |
| parent | d460892bbfece74fb6d3cd846bf6ef548290be41 (diff) | |
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latestt pu
Diffstat (limited to 'src/ppp')
| -rw-r--r-- | src/ppp/meson.build | 2 | ||||
| -rw-r--r-- | src/ppp/nm-ppp-manager.c | 12 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/ppp/meson.build b/src/ppp/meson.build index 0c458768..181a6bef 100644 --- a/src/ppp/meson.build +++ b/src/ppp/meson.build @@ -1,3 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1+ + name = 'nm-pppd-plugin' c_flags = [ diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c index f649e0cb..751ec28b 100644 --- a/src/ppp/nm-ppp-manager.c +++ b/src/ppp/nm-ppp-manager.c @@ -41,7 +41,8 @@ #define NM_PPPD_PLUGIN PPPD_PLUGIN_DIR "/nm-pppd-plugin.so" -static NM_CACHED_QUARK_FCN ("ppp-manager-secret-tries", ppp_manager_secret_tries_quark) +static +NM_CACHED_QUARK_FCN ("ppp-manager-secret-tries", ppp_manager_secret_tries_quark) /*****************************************************************************/ @@ -664,7 +665,8 @@ out: /*****************************************************************************/ -NM_UTILS_LOOKUP_STR_DEFINE_STATIC (pppd_exit_code_to_str, int, +static +NM_UTILS_LOOKUP_STR_DEFINE (pppd_exit_code_to_str, int, NM_UTILS_LOOKUP_DEFAULT ("Unknown error"), NM_UTILS_LOOKUP_STR_ITEM ( 1, "Fatal pppd error"); NM_UTILS_LOOKUP_STR_ITEM ( 2, "pppd options error"), @@ -1259,7 +1261,7 @@ static void get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE ((NMPPPManager *) object); + NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (object); switch (prop_id) { case PROP_PARENT_IFACE: @@ -1275,7 +1277,7 @@ static void set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE ((NMPPPManager *) object); + NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (object); switch (prop_id) { case PROP_PARENT_IFACE: @@ -1333,7 +1335,7 @@ dispose (GObject *object) static void finalize (GObject *object) { - NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE ((NMPPPManager *) object); + NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (object); g_free (priv->parent_iface); |