diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-04-30 15:02:53 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-04-30 15:59:27 +0200 |
| commit | 31e132940de285cf6851f9c480fea4db1bb7ca22 (patch) | |
| tree | 17b670400aec25f63bf48a0793d960d46679ef85 | |
| parent | ab5e6b2352646c21aaeb545f7c1025851be8f203 (diff) | |
| download | NetworkManager-th/reapply-fixes-bgo765848.tar.gz | |
cli: declare external variable nm_cli in <nmcli.h> headerth/reapply-fixes-bgo765848
| -rw-r--r-- | clients/cli/common.c | 4 | ||||
| -rw-r--r-- | clients/cli/connections.c | 3 | ||||
| -rw-r--r-- | clients/cli/devices.c | 3 | ||||
| -rw-r--r-- | clients/cli/nmcli.h | 3 | ||||
| -rw-r--r-- | clients/cli/settings.c | 7 |
5 files changed, 2 insertions, 18 deletions
diff --git a/clients/cli/common.c b/clients/cli/common.c index 0aa5efc260..0888f0630c 100644 --- a/clients/cli/common.c +++ b/clients/cli/common.c @@ -1170,10 +1170,6 @@ nmc_set_in_readline (gboolean in_readline) pthread_mutex_unlock (&readline_mutex); } -/* Global variable defined in nmcli.c */ -extern NmCli nm_cli; - - static char * nmc_readline_helper (const char *prompt) { diff --git a/clients/cli/connections.c b/clients/cli/connections.c index d01e38efba..1f1dae5981 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -261,9 +261,6 @@ typedef struct { } TabCompletionInfo; static TabCompletionInfo nmc_tab_completion = {NULL, NULL, NULL, NULL}; -/* Global variable defined in nmcli.c - used for TAB completion */ -extern NmCli nm_cli; - static char *gen_connection_types (const char *text, int state); static void diff --git a/clients/cli/devices.c b/clients/cli/devices.c index d14807b48c..65c4be7286 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -3572,9 +3572,6 @@ is_single_word (const char* line) return FALSE; } -/* Global variable defined in nmcli.c */ -extern NmCli nm_cli; - static char * gen_func_ifnames (const char *text, int state) { diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h index 9048a69f7e..34100f0026 100644 --- a/clients/cli/nmcli.h +++ b/clients/cli/nmcli.h @@ -161,6 +161,8 @@ typedef struct _NmCli { NmcTermColor editor_prompt_color; /* Color of prompt in connection editor */ } NmCli; +extern NmCli nm_cli; + /* Error quark for GError domain */ #define NMCLI_ERROR (nmcli_error_quark ()) GQuark nmcli_error_quark (void); @@ -169,5 +171,4 @@ gboolean nmc_seen_sigint (void); void nmc_clear_sigint (void); void nmc_set_sigquit_internal (void); - #endif /* NMC_NMCLI_H */ diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 06e9fb4722..1651aab226 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -2082,13 +2082,6 @@ typedef struct { NmcPropertyFuncsFields } NmcPropertyFuncs; -/* - * We need NmCli in some _set_property functions, and they aren't passed NmCli. - * So use the global variable. - */ -/* Global variable defined in nmcli.c */ -extern NmCli nm_cli; - NMSetting * nmc_setting_new_for_name (const char *name) { |