aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-12-06 22:55:09 +0100
committerJelmer Vernooij <jelmer@samba.org>2005-12-06 22:55:09 +0100
commitc3ffa45876c584d3e86c0796f2210538bcebc377 (patch)
tree0d25e14f82bfc0532e94452f4218153c3f8f2612
parentd636233a518fbe46264230866d4b8ea463f1474e (diff)
Add some const
-rw-r--r--protocols/proxy.c22
-rw-r--r--protocols/proxy.h2
2 files changed, 7 insertions, 17 deletions
diff --git a/protocols/proxy.c b/protocols/proxy.c
index fb87e356..0546f2d7 100644
--- a/protocols/proxy.c
+++ b/protocols/proxy.c
@@ -49,16 +49,6 @@
#define GAIM_WRITE_COND (G_IO_OUT | G_IO_HUP | G_IO_ERR | G_IO_NVAL)
#define GAIM_ERR_COND (G_IO_HUP | G_IO_ERR | G_IO_NVAL)
-/*FIXME*
- #ifndef _WIN32
- if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &error, &len) < 0) {
- closesocket(fd);
- g_free(phb);
- return -1;
- }
- fcntl(fd, F_SETFL, 0);
-#endif*/
-
char proxyhost[128] = "";
int proxyport = 0;
int proxytype = PROXY_NONE;
@@ -82,7 +72,7 @@ typedef struct _GaimIOClosure {
-static struct sockaddr_in *gaim_gethostbyname(char *host, int port)
+static struct sockaddr_in *gaim_gethostbyname(const char *host, int port)
{
static struct sockaddr_in sin;
@@ -153,7 +143,7 @@ static void gaim_io_connected(gpointer data, gint source, GaimInputCondition con
}
}
-static int proxy_connect_none(char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_none(const char *host, unsigned short port, struct PHB *phb)
{
struct sockaddr_in *sin;
int fd = -1;
@@ -280,7 +270,7 @@ static void http_canwrite(gpointer data, gint source, GaimInputCondition cond)
phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, http_canread, phb);
}
-static int proxy_connect_http(char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_http(const char *host, unsigned short port, struct PHB *phb)
{
phb->host = g_strdup(host);
phb->port = port;
@@ -364,7 +354,7 @@ static void s4_canwrite(gpointer data, gint source, GaimInputCondition cond)
phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s4_canread, phb);
}
-static int proxy_connect_socks4(char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_socks4(const char *host, unsigned short port, struct PHB *phb)
{
phb->host = g_strdup(host);
phb->port = port;
@@ -546,7 +536,7 @@ static void s5_canwrite(gpointer data, gint source, GaimInputCondition cond)
phb->inpa = gaim_input_add(source, GAIM_INPUT_READ, s5_canread, phb);
}
-static int proxy_connect_socks5(char *host, unsigned short port, struct PHB *phb)
+static int proxy_connect_socks5(const char *host, unsigned short port, struct PHB *phb)
{
phb->host = g_strdup(host);
phb->port = port;
@@ -587,7 +577,7 @@ void gaim_input_remove(gint tag)
g_source_remove(tag);
}
-int proxy_connect(char *host, int port, GaimInputFunction func, gpointer data)
+int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data)
{
struct PHB *phb;
diff --git a/protocols/proxy.h b/protocols/proxy.h
index 7c34fc40..47c966d2 100644
--- a/protocols/proxy.h
+++ b/protocols/proxy.h
@@ -55,6 +55,6 @@ typedef void (*GaimInputFunction)(gpointer, gint, GaimInputCondition);
G_MODULE_EXPORT gint gaim_input_add(int, GaimInputCondition, GaimInputFunction, gpointer);
G_MODULE_EXPORT void gaim_input_remove(gint);
-G_MODULE_EXPORT int proxy_connect(char *host, int port, GaimInputFunction func, gpointer data);
+G_MODULE_EXPORT int proxy_connect(const char *host, int port, GaimInputFunction func, gpointer data);
#endif /* _PROXY_H_ */