<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40460 >
> [EMAIL PROTECTED] - Mon Aug 25 20:42:24 2008]:
>
> 2008/8/25 Madeline Book:
> > Or the prefix my_ could be changed, perhaps to fc_ or
> > similar (there are unfortunately many freeciv support
> > functions that start with my_ :().
>
> I would vote for 'fc_' -prefix. It's not necessary to replace all
> 'my_' -functions with 'fc_' -functions now, but over time we should go
> that way.
>
> Or maybe also just two letter 'fc' is too likely to cause namespace
> conflicts... 'fciv' is not good as this is Freeciv, not FreeCiv.
Possibly, though I can't think of any libraries that freeciv
would use that would use the "fc_" prefix. And there are
already fc_calloc/malloc that use this convention. Attached
patch changes all my_ prefixes in netinf.h to use fc_ and
updates all occurences of those functions.
----------------------------------------------------------------------
ブドウは好きだから、建物を紫に塗った。
client/civclient.c | 4 ++--
client/clinet.c | 10 +++++-----
client/servers.c | 30 +++++++++++++++---------------
common/connection.c | 8 ++++----
server/meta.c | 48 ++++++++++++++++++++++++------------------------
server/sernet.c | 26 +++++++++++++-------------
server/srv_main.c | 2 +-
utility/netintf.c | 44 ++++++++++++++++++++++----------------------
utility/netintf.h | 32 ++++++++++++++++----------------
9 files changed, 102 insertions(+), 102 deletions(-)
diff --git a/client/civclient.c b/client/civclient.c
index 1df2bcb..d944bb8 100644
--- a/client/civclient.c
+++ b/client/civclient.c
@@ -172,7 +172,7 @@ static void charsets_init(void)
static void at_exit(void)
{
client_kill_server(TRUE);
- my_shutdown_network();
+ fc_shutdown_network();
}
/**************************************************************************
@@ -379,7 +379,7 @@ int main(int argc, char *argv[])
ui_init();
charsets_init();
- my_init_network();
+ fc_init_network();
/* register exit handler */
atexit(at_exit);
diff --git a/client/clinet.c b/client/clinet.c
index 01c9e29..260e994 100644
--- a/client/clinet.c
+++ b/client/clinet.c
@@ -102,7 +102,7 @@
/* In autoconnect mode, try to connect 100 times */
#define MAX_AUTOCONNECT_ATTEMPTS 100
-static union my_sockaddr server_addr;
+static union fc_sockaddr server_addr;
/*************************************************************************
Close socket and cleanup. This one doesn't print a message, so should
@@ -205,10 +205,10 @@ static int try_to_connect(const char *username, char *errbuf, int errbufsize)
return -1;
}
- if (my_connect(client.conn.sock, &server_addr.saddr,
+ if (fc_connect(client.conn.sock, &server_addr.saddr,
sockaddr_size(&server_addr)) == -1) {
(void) mystrlcpy(errbuf, mystrerror(), errbufsize);
- my_closesocket(client.conn.sock);
+ fc_closesocket(client.conn.sock);
client.conn.sock = -1;
#ifdef HAVE_WINSOCK
return -1;
@@ -330,11 +330,11 @@ static int read_from_connection(struct connection *pc, bool block)
MY_FD_ZERO(&writefs);
FD_SET(socket_fd, &writefs);
n =
- my_select(socket_fd + 1, &readfs, &writefs, &exceptfs,
+ fc_select(socket_fd + 1, &readfs, &writefs, &exceptfs,
block ? NULL : &tv);
} else {
n =
- my_select(socket_fd + 1, &readfs, NULL, &exceptfs,
+ fc_select(socket_fd + 1, &readfs, NULL, &exceptfs,
block ? NULL : &tv);
}
diff --git a/client/servers.c b/client/servers.c
index 6d4d505..71cbab5 100644
--- a/client/servers.c
+++ b/client/servers.c
@@ -297,7 +297,7 @@ static void meta_send_request(struct server_scan *scan)
my_uname(machine_string, sizeof(machine_string));
- capstr = my_url_encode(our_capability);
+ capstr = fc_url_encode(our_capability);
my_snprintf(str, sizeof(str),
"POST %s HTTP/1.1\r\n"
@@ -314,7 +314,7 @@ static void meta_send_request(struct server_scan *scan)
(unsigned long) (strlen("client_cap=") + strlen(capstr)),
capstr);
- if (my_writesocket(scan->sock, str, strlen(str)) != strlen(str)) {
+ if (fc_writesocket(scan->sock, str, strlen(str)) != strlen(str)) {
/* Even with non-blocking this shouldn't fail. */
(scan->error_func)(scan, mystrerror());
return;
@@ -349,7 +349,7 @@ static void meta_read_response(struct server_scan *scan)
}
while (1) {
- result = my_readsocket(scan->sock, buf, sizeof(buf));
+ result = fc_readsocket(scan->sock, buf, sizeof(buf));
if (result < 0) {
if (errno == EAGAIN || errno == EINTR || errno == EWOULDBLOCK) {
@@ -399,10 +399,10 @@ static void meta_read_response(struct server_scan *scan)
****************************************************************************/
static bool begin_metaserver_scan(struct server_scan *scan)
{
- union my_sockaddr addr;
+ union fc_sockaddr addr;
int s;
- scan->meta.urlpath = my_lookup_httpd(scan->meta.name, &scan->meta.port,
+ scan->meta.urlpath = fc_lookup_httpd(scan->meta.name, &scan->meta.port,
metaserver);
if (!scan->meta.urlpath) {
(scan->error_func)(scan,
@@ -421,15 +421,15 @@ static bool begin_metaserver_scan(struct server_scan *scan)
return FALSE;
}
- my_nonblock(s);
+ fc_nonblock(s);
- if (my_connect(s, &addr.saddr, sockaddr_size(&addr)) == -1) {
+ if (fc_connect(s, &addr.saddr, sockaddr_size(&addr)) == -1) {
if (errno == EINPROGRESS) {
/* With non-blocking sockets this is the expected result. */
scan->meta.state = META_CONNECTING;
scan->sock = s;
} else {
- my_closesocket(s);
+ fc_closesocket(s);
(scan->error_func)(scan, mystrerror());
return FALSE;
}
@@ -462,7 +462,7 @@ static struct server_list *get_metaserver_list(struct server_scan *scan)
switch (scan->meta.state) {
case META_CONNECTING:
- if (my_select(scan->sock + 1, NULL, &sockset, NULL, &tv) < 0) {
+ if (fc_select(scan->sock + 1, NULL, &sockset, NULL, &tv) < 0) {
(scan->error_func)(scan, mystrerror());
} else if (FD_ISSET(scan->sock, &sockset)) {
meta_send_request(scan);
@@ -471,7 +471,7 @@ static struct server_list *get_metaserver_list(struct server_scan *scan)
}
return NULL;
case META_WAITING:
- if (my_select(scan->sock + 1, &sockset, NULL, NULL, &tv) < 0) {
+ if (fc_select(scan->sock + 1, &sockset, NULL, NULL, &tv) < 0) {
(scan->error_func)(scan, mystrerror());
} else if (FD_ISSET(scan->sock, &sockset)) {
meta_read_response(scan);
@@ -532,7 +532,7 @@ static void delete_server_list(struct server_list *server_list)
**************************************************************************/
static bool begin_lanserver_scan(struct server_scan *scan)
{
- union my_sockaddr addr;
+ union fc_sockaddr addr;
struct data_out dout;
int sock, opt = 1;
#ifndef HAVE_WINSOCK
@@ -630,7 +630,7 @@ static bool begin_lanserver_scan(struct server_scan *scan)
freelog(LOG_DEBUG, ("Sending request for server announcement on LAN."));
}
- my_closesocket(sock);
+ fc_closesocket(sock);
/* Create a socket for listening for server packets. */
if ((scan->sock = socket(family, SOCK_DGRAM, 0)) < 0) {
@@ -638,7 +638,7 @@ static bool begin_lanserver_scan(struct server_scan *scan)
return FALSE;
}
- my_nonblock(scan->sock);
+ fc_nonblock(scan->sock);
if (setsockopt(scan->sock, SOL_SOCKET, SO_REUSEADDR,
(char *)&opt, sizeof(opt)) == -1) {
@@ -701,7 +701,7 @@ static bool begin_lanserver_scan(struct server_scan *scan)
static struct server_list *get_lan_server_list(struct server_scan *scan)
{
socklen_t fromlen;
- union my_sockaddr fromend;
+ union fc_sockaddr fromend;
char msgbuf[128];
int type;
struct data_in din;
@@ -890,7 +890,7 @@ void server_scan_finish(struct server_scan *scan)
return;
}
if (scan->sock >= 0) {
- my_closesocket(scan->sock);
+ fc_closesocket(scan->sock);
scan->sock = -1;
}
diff --git a/common/connection.c b/common/connection.c
index 29f7361..41c613a 100644
--- a/common/connection.c
+++ b/common/connection.c
@@ -160,7 +160,7 @@ int read_socket_data(int sock, struct socket_packet_buffer *buffer)
}
freelog(LOG_DEBUG, "try reading %d bytes", buffer->nsize - buffer->ndata);
- didget = my_readsocket(sock, (char *) (buffer->data + buffer->ndata),
+ didget = fc_readsocket(sock, (char *) (buffer->data + buffer->ndata),
buffer->nsize - buffer->ndata);
if (didget > 0) {
@@ -211,7 +211,7 @@ static int write_socket_data(struct connection *pc,
tv.tv_sec = 0; tv.tv_usec = 0;
- if (my_select(pc->sock+1, NULL, &writefs, &exceptfs, &tv) <= 0) {
+ if (fc_select(pc->sock+1, NULL, &writefs, &exceptfs, &tv) <= 0) {
if (errno != EINTR) {
break;
} else {
@@ -236,7 +236,7 @@ static int write_socket_data(struct connection *pc,
if (FD_ISSET(pc->sock, &writefs)) {
nblock=MIN(buf->ndata-start, MAX_LEN_PACKET);
freelog(LOG_DEBUG,"trying to write %d limit=%d",nblock,limit);
- if((nput=my_writesocket(pc->sock,
+ if((nput=fc_writesocket(pc->sock,
(const char *)buf->data+start, nblock)) == -1) {
#ifdef NONBLOCKING_SOCKETS
if (errno == EWOULDBLOCK || errno == EAGAIN) {
@@ -656,7 +656,7 @@ void connection_common_close(struct connection *pconn)
if (!pconn->used) {
freelog(LOG_ERROR, "WARNING: Trying to close already closed connection");
} else {
- my_closesocket(pconn->sock);
+ fc_closesocket(pconn->sock);
pconn->used = FALSE;
pconn->established = FALSE;
diff --git a/server/meta.c b/server/meta.c
index 31dd291..b2cfb5c 100644
--- a/server/meta.c
+++ b/server/meta.c
@@ -61,7 +61,7 @@
static bool server_is_open = FALSE;
-static union my_sockaddr meta_addr;
+static union fc_sockaddr meta_addr;
static char metaname[MAX_LEN_ADDR];
static int metaport;
static char *metaserver_path;
@@ -221,11 +221,11 @@ static bool send_to_metaserver(enum meta_flag flag)
return FALSE;
}
- if (my_connect(sock, &meta_addr.saddr,
+ if (fc_connect(sock, &meta_addr.saddr,
sockaddr_size(&meta_addr)) == -1) {
freelog(LOG_ERROR, "Metaserver: connect failed: %s", mystrerror());
metaserver_failed();
- my_closesocket(sock);
+ fc_closesocket(sock);
return FALSE;
}
@@ -256,22 +256,22 @@ static bool send_to_metaserver(enum meta_flag flag)
mystrlcpy(s, "bye=1&", rest);
s = end_of_strn(s, &rest);
} else {
- my_snprintf(s, rest, "version=%s&", my_url_encode(VERSION_STRING));
+ my_snprintf(s, rest, "version=%s&", fc_url_encode(VERSION_STRING));
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "patches=%s&",
- my_url_encode(get_meta_patches_string()));
+ fc_url_encode(get_meta_patches_string()));
s = end_of_strn(s, &rest);
- my_snprintf(s, rest, "capability=%s&", my_url_encode(our_capability));
+ my_snprintf(s, rest, "capability=%s&", fc_url_encode(our_capability));
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "serverid=%s&",
- my_url_encode(srvarg.serverid));
+ fc_url_encode(srvarg.serverid));
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "message=%s&",
- my_url_encode(get_meta_message_string()));
+ fc_url_encode(get_meta_message_string()));
s = end_of_strn(s, &rest);
/* NOTE: send info for ALL players or none at all. */
@@ -296,23 +296,23 @@ static bool send_to_metaserver(enum meta_flag flag)
sz_strlcpy(type, "Human");
}
- my_snprintf(s, rest, "plu[]=%s&", my_url_encode(plr->username));
+ my_snprintf(s, rest, "plu[]=%s&", fc_url_encode(plr->username));
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "plt[]=%s&", type);
s = end_of_strn(s, &rest);
- my_snprintf(s, rest, "pll[]=%s&", my_url_encode(player_name(plr)));
+ my_snprintf(s, rest, "pll[]=%s&", fc_url_encode(player_name(plr)));
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "pln[]=%s&",
- my_url_encode(plr->nation != NO_NATION_SELECTED
+ fc_url_encode(plr->nation != NO_NATION_SELECTED
? nation_plural_for_player(plr)
: "none"));
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "plh[]=%s&",
- pconn ? my_url_encode(pconn->addr) : "");
+ pconn ? fc_url_encode(pconn->addr) : "");
s = end_of_strn(s, &rest);
/* is this player available to take?
@@ -347,39 +347,39 @@ static bool send_to_metaserver(enum meta_flag flag)
/* send some variables: should be listed in inverted order
* FIXME: these should be input from the settings array */
my_snprintf(s, rest, "vn[]=%s&vv[]=%d&",
- my_url_encode("timeout"), game.info.timeout);
+ fc_url_encode("timeout"), game.info.timeout);
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "vn[]=%s&vv[]=%d&",
- my_url_encode("year"), game.info.year);
+ fc_url_encode("year"), game.info.year);
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "vn[]=%s&vv[]=%d&",
- my_url_encode("turn"), game.info.turn);
+ fc_url_encode("turn"), game.info.turn);
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "vn[]=%s&vv[]=%d&",
- my_url_encode("endyear"), game.info.end_year);
+ fc_url_encode("endyear"), game.info.end_year);
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "vn[]=%s&vv[]=%d&",
- my_url_encode("minplayers"), game.info.min_players);
+ fc_url_encode("minplayers"), game.info.min_players);
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "vn[]=%s&vv[]=%d&",
- my_url_encode("maxplayers"), game.info.max_players);
+ fc_url_encode("maxplayers"), game.info.max_players);
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "vn[]=%s&vv[]=%s&",
- my_url_encode("allowtake"), game.allow_take);
+ fc_url_encode("allowtake"), game.allow_take);
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "vn[]=%s&vv[]=%d&",
- my_url_encode("generator"), map.generator);
+ fc_url_encode("generator"), map.generator);
s = end_of_strn(s, &rest);
my_snprintf(s, rest, "vn[]=%s&vv[]=%d&",
- my_url_encode("size"), map.size);
+ fc_url_encode("size"), map.size);
s = end_of_strn(s, &rest);
}
@@ -397,9 +397,9 @@ static bool send_to_metaserver(enum meta_flag flag)
str
);
- my_writesocket(sock, msg, n);
+ fc_writesocket(sock, msg, n);
- my_closesocket(sock);
+ fc_closesocket(sock);
return TRUE;
}
@@ -424,7 +424,7 @@ bool server_open_meta(void)
metaserver_path = NULL;
}
- if (!(path = my_lookup_httpd(metaname, &metaport, srvarg.metaserver_addr))) {
+ if (!(path = fc_lookup_httpd(metaname, &metaport, srvarg.metaserver_addr))) {
return FALSE;
}
diff --git a/server/sernet.c b/server/sernet.c
index c7749ae..236c43f 100644
--- a/server/sernet.c
+++ b/server/sernet.c
@@ -235,8 +235,8 @@ void close_connections_and_socket(void)
conn_list_free(game.all_connections);
conn_list_free(game.est_connections);
- my_closesocket(sock);
- my_closesocket(socklan);
+ fc_closesocket(sock);
+ fc_closesocket(socklan);
#ifdef HAVE_LIBREADLINE
if (history_file) {
@@ -248,7 +248,7 @@ void close_connections_and_socket(void)
send_server_info_to_metaserver(META_GOODBYE);
server_close_meta();
- my_shutdown_network();
+ fc_shutdown_network();
}
/*****************************************************************************
@@ -325,7 +325,7 @@ void flush_packets(void)
return;
}
- if(my_select(max_desc+1, NULL, &writefs, &exceptfs, &tv)<=0) {
+ if(fc_select(max_desc+1, NULL, &writefs, &exceptfs, &tv)<=0) {
return;
}
@@ -606,7 +606,7 @@ enum server_events server_sniff_all_input(void)
}
con_prompt_off(); /* output doesn't generate a new prompt */
- if (my_select(max_desc + 1, &readfs, &writefs, &exceptfs, &tv) == 0) {
+ if (fc_select(max_desc + 1, &readfs, &writefs, &exceptfs, &tv) == 0) {
/* timeout */
(void) send_server_info_to_metaserver(META_REFRESH);
if (game.info.timeout > 0
@@ -820,7 +820,7 @@ static int server_accept_connection(int sockfd)
socklen_t fromlen;
int new_sock;
- union my_sockaddr fromend;
+ union fc_sockaddr fromend;
bool nameinfo = FALSE;
#ifdef IPV6_SUPPORT
char host[NI_MAXHOST], service[NI_MAXSERV];
@@ -874,7 +874,7 @@ int server_make_connection(int new_sock, const char *client_addr, const char *cl
{
int i;
- my_nonblock(new_sock);
+ fc_nonblock(new_sock);
for(i=0; i<MAX_NUM_CONNECTIONS; i++) {
struct connection *pconn = &connections[i];
@@ -924,8 +924,8 @@ int server_make_connection(int new_sock, const char *client_addr, const char *cl
int server_open_socket(void)
{
/* setup socket address */
- union my_sockaddr src;
- union my_sockaddr addr;
+ union fc_sockaddr src;
+ union fc_sockaddr addr;
struct ip_mreq mreq4;
const char *group;
int opt;
@@ -986,7 +986,7 @@ int server_open_socket(void)
freelog(LOG_ERROR, "SO_REUSEADDR failed: %s", mystrerror());
}
- my_nonblock(socklan);
+ fc_nonblock(socklan);
group = get_multicast_group(srvarg.announce == ANNOUNCE_IPV6);
@@ -1174,7 +1174,7 @@ static void get_lanserver_announcement(void)
tv.tv_sec = 0;
tv.tv_usec = 0;
- while (my_select(socklan + 1, &readfs, NULL, &exceptfs, &tv) == -1) {
+ while (fc_select(socklan + 1, &readfs, NULL, &exceptfs, &tv) == -1) {
if (errno != EINTR) {
freelog(LOG_ERROR, "select failed: %s", mystrerror());
return;
@@ -1215,7 +1215,7 @@ static void send_lanserver_response(void)
char players[256];
char status[256];
struct data_out dout;
- union my_sockaddr addr;
+ union fc_sockaddr addr;
int socksend, setting = 1;
const char *group;
size_t size;
@@ -1302,5 +1302,5 @@ static void send_lanserver_response(void)
return;
}
- my_closesocket(socksend);
+ fc_closesocket(socksend);
}
diff --git a/server/srv_main.c b/server/srv_main.c
index 4ea8dc3..1fd4435 100644
--- a/server/srv_main.c
+++ b/server/srv_main.c
@@ -1905,7 +1905,7 @@ static void srv_prepare(void)
srv_init();
}
- my_init_network();
+ fc_init_network();
con_log_init(srvarg.log_filename, srvarg.loglevel);
diff --git a/utility/netintf.c b/utility/netintf.c
index 5bf227a..fa7abb2 100644
--- a/utility/netintf.c
+++ b/utility/netintf.c
@@ -90,7 +90,7 @@ static void set_socket_errno(void)
/***************************************************************
Connect a socket to an address
***************************************************************/
-int my_connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen)
+int fc_connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen)
{
int result;
@@ -108,7 +108,7 @@ int my_connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen)
/***************************************************************
Wait for a number of sockets to change status
**************************************************************/
-int my_select(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+int fc_select(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
struct timeval *timeout)
{
int result;
@@ -127,7 +127,7 @@ int my_select(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
/***************************************************************
Read from a socket.
***************************************************************/
-int my_readsocket(int sock, void *buf, size_t size)
+int fc_readsocket(int sock, void *buf, size_t size)
{
int result;
@@ -146,7 +146,7 @@ int my_readsocket(int sock, void *buf, size_t size)
/***************************************************************
Write to a socket.
***************************************************************/
-int my_writesocket(int sock, const void *buf, size_t size)
+int fc_writesocket(int sock, const void *buf, size_t size)
{
int result;
@@ -165,7 +165,7 @@ int my_writesocket(int sock, const void *buf, size_t size)
/***************************************************************
Close a socket.
***************************************************************/
-void my_closesocket(int sock)
+void fc_closesocket(int sock)
{
#ifdef HAVE_WINSOCK
closesocket(sock);
@@ -177,7 +177,7 @@ void my_closesocket(int sock)
/***************************************************************
Initialize network stuff.
***************************************************************/
-void my_init_network(void)
+void fc_init_network(void)
{
#ifdef HAVE_WINSOCK
WSADATA wsa;
@@ -196,7 +196,7 @@ void my_init_network(void)
/***************************************************************
Shutdown network stuff.
***************************************************************/
-void my_shutdown_network(void)
+void fc_shutdown_network(void)
{
#ifdef HAVE_WINSOCK
WSACleanup();
@@ -206,7 +206,7 @@ void my_shutdown_network(void)
/***************************************************************
Set socket to non-blocking.
***************************************************************/
-void my_nonblock(int sockfd)
+void fc_nonblock(int sockfd)
{
#ifdef NONBLOCKING_SOCKETS
#ifdef HAVE_WINSOCK
@@ -243,7 +243,7 @@ void my_nonblock(int sockfd)
/***************************************************************************
Write information about socaddr to debug log.
***************************************************************************/
-void sockaddr_debug(union my_sockaddr *addr)
+void sockaddr_debug(union fc_sockaddr *addr)
{
#ifdef IPV6_SUPPORT
char buf[INET6_ADDRSTRLEN] = "Unknown";
@@ -268,10 +268,10 @@ void sockaddr_debug(union my_sockaddr *addr)
}
/***************************************************************************
- Gets size of address to my_sockaddr. IPv6/IPv4 must be selected before
+ Gets size of address to fc_sockaddr. IPv6/IPv4 must be selected before
calling this.
***************************************************************************/
-int sockaddr_size(union my_sockaddr *addr)
+int sockaddr_size(union fc_sockaddr *addr)
{
#ifdef IPV6_SUPPORT
if (addr->saddr.sa_family == AF_INET6) {
@@ -286,7 +286,7 @@ int sockaddr_size(union my_sockaddr *addr)
/***************************************************************************
Returns wether address is IPv6 address.
***************************************************************************/
-bool sockaddr_ipv6(union my_sockaddr *addr)
+bool sockaddr_ipv6(union fc_sockaddr *addr)
{
#ifdef IPV6_SUPPORT
if (addr->saddr.sa_family == AF_INET6) {
@@ -301,7 +301,7 @@ bool sockaddr_ipv6(union my_sockaddr *addr)
/***************************************************************************
Look up the service at hostname:port and fill in *sa.
***************************************************************************/
-bool net_lookup_service(const char *name, int port, union my_sockaddr *addr)
+bool net_lookup_service(const char *name, int port, union fc_sockaddr *addr)
{
struct hostent *hp;
struct sockaddr_in *sock4;
@@ -379,7 +379,7 @@ bool net_lookup_service(const char *name, int port, union my_sockaddr *addr)
Writes buf to socket and returns the response in an fz_FILE.
Use only on blocking sockets.
*************************************************************************/
-fz_FILE *my_querysocket(int sock, void *buf, size_t size)
+fz_FILE *fc_querysocket(int sock, void *buf, size_t size)
{
FILE *fp;
@@ -390,7 +390,7 @@ fz_FILE *my_querysocket(int sock, void *buf, size_t size)
}
fflush(fp);
- /* we don't use my_closesocket on sock here since when fp is closed
+ /* we don't use fc_closesocket on sock here since when fp is closed
* sock will also be closed. fdopen doesn't dup the socket descriptor. */
#else
{
@@ -418,16 +418,16 @@ fz_FILE *my_querysocket(int sock, void *buf, size_t size)
return NULL;
}
- my_writesocket(sock, buf, size);
+ fc_writesocket(sock, buf, size);
- while ((n = my_readsocket(sock, tmp, sizeof(tmp))) > 0) {
+ while ((n = fc_readsocket(sock, tmp, sizeof(tmp))) > 0) {
if (fwrite(tmp, 1, n, fp) != n) {
die("socket %d: write error", sock);
}
}
fflush(fp);
- my_closesocket(sock);
+ fc_closesocket(sock);
rewind(fp);
}
@@ -440,7 +440,7 @@ fz_FILE *my_querysocket(int sock, void *buf, size_t size)
Returns a valid httpd server and port, plus the path to the resource
at the url location.
*************************************************************************/
-const char *my_lookup_httpd(char *server, int *port, const char *url)
+const char *fc_lookup_httpd(char *server, int *port, const char *url)
{
const char *purl, *str, *ppath, *pport;
const char *str2;
@@ -520,7 +520,7 @@ static bool is_url_safe(unsigned ch)
URL-encode a string as per RFC 2396.
Should work for all ASCII based charsets: including UTF-8.
***************************************************************/
-const char *my_url_encode(const char *txt)
+const char *fc_url_encode(const char *txt)
{
static char buf[2048];
unsigned ch;
@@ -556,7 +556,7 @@ int find_next_free_port(int starting_port)
int port, s = socket(AF_INET, SOCK_STREAM, 0);
for (port = starting_port;; port++) {
- union my_sockaddr tmp;
+ union fc_sockaddr tmp;
struct sockaddr_in *sock = &tmp.saddr_in4;
memset(&tmp, 0, sizeof(tmp));
@@ -570,7 +570,7 @@ int find_next_free_port(int starting_port)
}
}
- my_closesocket(s);
+ fc_closesocket(s);
return port;
}
diff --git a/utility/netintf.h b/utility/netintf.h
index f4c7530..02b227e 100644
--- a/utility/netintf.h
+++ b/utility/netintf.h
@@ -67,7 +67,7 @@
typedef int socklen_t;
#endif
-union my_sockaddr {
+union fc_sockaddr {
struct sockaddr saddr;
struct sockaddr_in saddr_in4;
#ifdef IPV6_SUPPORT
@@ -84,26 +84,26 @@ enum announce_type {
#define ANNOUNCE_DEFAULT ANNOUNCE_IPV4
-int my_connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen);
-int my_select(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
+int fc_connect(int sockfd, const struct sockaddr *serv_addr, socklen_t addrlen);
+int fc_select(int n, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
struct timeval *timeout);
-int my_readsocket(int sock, void *buf, size_t size);
-int my_writesocket(int sock, const void *buf, size_t size);
-void my_closesocket(int sock);
-void my_init_network(void);
-void my_shutdown_network(void);
+int fc_readsocket(int sock, void *buf, size_t size);
+int fc_writesocket(int sock, const void *buf, size_t size);
+void fc_closesocket(int sock);
+void fc_init_network(void);
+void fc_shutdown_network(void);
-void my_nonblock(int sockfd);
+void fc_nonblock(int sockfd);
bool net_lookup_service(const char *name, int port,
- union my_sockaddr *addr);
-fz_FILE *my_querysocket(int sock, void *buf, size_t size);
+ union fc_sockaddr *addr);
+fz_FILE *fc_querysocket(int sock, void *buf, size_t size);
int find_next_free_port(int starting_port);
-const char *my_lookup_httpd(char *server, int *port, const char *url);
-const char *my_url_encode(const char *txt);
+const char *fc_lookup_httpd(char *server, int *port, const char *url);
+const char *fc_url_encode(const char *txt);
-void sockaddr_debug(union my_sockaddr *addr);
-int sockaddr_size(union my_sockaddr *addr);
-bool sockaddr_ipv6(union my_sockaddr *addr);
+void sockaddr_debug(union fc_sockaddr *addr);
+int sockaddr_size(union fc_sockaddr *addr);
+bool sockaddr_ipv6(union fc_sockaddr *addr);
#endif /* FC__NETINTF_H */
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
