diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-04-02 19:16:47 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-04-04 19:28:41 +0200 |
| commit | 038d53a74520ad9e0814cd839dc16b53f69c84c5 (patch) | |
| tree | c95524e12f0f8365b28790c6bb9ecbb8f1a9c7ca /clients | |
| parent | 30b8bb476a004ecb95a1cf867fed74b21f3b9c1d (diff) | |
| download | NetworkManager-038d53a74520ad9e0814cd839dc16b53f69c84c5.tar.gz | |
cli: hide nm_cli global variable from public headers
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/cli/nmcli.c | 3 | ||||
| -rw-r--r-- | clients/cli/nmcli.h | 2 | ||||
| -rw-r--r-- | clients/cli/settings.c | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c index aedb2e0874..08d3ab16e0 100644 --- a/clients/cli/nmcli.c +++ b/clients/cli/nmcli.c @@ -72,7 +72,7 @@ [NM_META_COLOR_ENABLED] = "32", \ [NM_META_COLOR_DISABLED] = "31", \ -NmCli nm_cli = { +static NmCli nm_cli = { .client = NULL, .return_value = NMC_RESULT_SUCCESS, @@ -102,6 +102,7 @@ NmCli nm_cli = { }; const NmCli *const nm_cli_global_readline = &nm_cli; +const NmCli *const nmc_meta_environment_arg = &nm_cli; /*****************************************************************************/ diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 29d52d09a3..96a1be1dde 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -140,8 +140,6 @@ typedef struct _NmCli { char *palette_buffer; /* Buffer with sequences for terminal-colors.d(5)-based coloring. */ } NmCli; -extern NmCli nm_cli; - extern const NmCli *const nm_cli_global_readline; /* Error quark for GError domain */ diff --git a/clients/cli/settings.c b/clients/cli/settings.c index d4cae2b3ad..0487fb9680 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -456,8 +456,6 @@ const NMMetaEnvironment *const nmc_meta_environment = &((NMMetaEnvironment) { .get_nm_connections = _env_get_nm_connections, }); -const NmCli *const nmc_meta_environment_arg = &nm_cli; - static char * get_property_val (NMSetting *setting, const char *prop, NMMetaAccessorGetType get_type, gboolean show_secrets, GError **error) { |