Namespace cleanup: s/set_http_proxy/openconnect_set_http_proxy/

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/http.c b/http.c
index 9d3abb9..38fec1b 100644 (file)
--- a/http.c
+++ b/http.c
@@ -1069,7 +1069,7 @@ int process_proxy(struct openconnect_info *vpninfo, int ssl_sock)
        return -EIO;
 }
 
-int set_http_proxy(struct openconnect_info *vpninfo, char *proxy)
+int openconnect_set_http_proxy(struct openconnect_info *vpninfo, char *proxy)
 {
        char *url = strdup(proxy);
        int ret;

diff --git a/main.c b/main.c
index b0651a2..2d9838b 100644 (file)
--- a/main.c
+++ b/main.c
@@ -453,7 +453,7 @@ int main(int argc, char **argv)
        if (autoproxy)
                vpninfo->proxy_factory = px_proxy_factory_new();
 #endif
-       if (proxy && set_http_proxy(vpninfo, proxy))
+       if (proxy && openconnect_set_http_proxy(vpninfo, proxy))
                exit(1);
 
        if (use_syslog) {

diff --git a/nm-auth-dialog.c b/nm-auth-dialog.c
index dd696de..9214423 100644 (file)
--- a/nm-auth-dialog.c
+++ b/nm-auth-dialog.c
@@ -963,7 +963,7 @@ if (0) {
        g_free(csd);
 
        proxy = get_gconf_setting(gcl, config_path, "proxy");
-       if (proxy && proxy[0] && set_http_proxy(vpninfo, proxy))
+       if (proxy && proxy[0] && openconnect_set_http_proxy(vpninfo, proxy))
                return -EINVAL;
 
        vpninfo->cert = get_gconf_setting(gcl, config_path, NM_OPENCONNECT_KEY_USERCERT);

diff --git a/openconnect.h b/openconnect.h
index 4673a3a..d400ea8 100644 (file)
--- a/openconnect.h
+++ b/openconnect.h
@@ -340,7 +340,7 @@ char *openconnect_create_useragent(char *base);
 int process_proxy(struct openconnect_info *vpninfo, int ssl_sock);
 int parse_url(char *url, char **res_proto, char **res_host, int *res_port,
              char **res_path, int default_port);
-int set_http_proxy(struct openconnect_info *vpninfo, char *proxy);
+int openconnect_set_http_proxy(struct openconnect_info *vpninfo, char *proxy);
 
 /* ssl_ui.c */
 int set_openssl_ui(void);