diff options
author | Haru <haru@dotalux.com> | 2015-06-18 01:52:38 +0200 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2015-08-15 00:51:38 +0200 |
commit | 1034bfb7a390cb21623c3892f4d2304e2458af79 (patch) | |
tree | 236ce246af0d248cff51bb85725a735c5aeccb06 /src/map/pc.c | |
parent | 747d3b7d5c6056470b1c9d3f41e09e0ed92af6d6 (diff) | |
download | hercules-1034bfb7a390cb21623c3892f4d2304e2458af79.tar.gz hercules-1034bfb7a390cb21623c3892f4d2304e2458af79.tar.bz2 hercules-1034bfb7a390cb21623c3892f4d2304e2458af79.tar.xz hercules-1034bfb7a390cb21623c3892f4d2304e2458af79.zip |
Cleaned up socket interface
- Replaced some macro calls with the proper interface syntax
- Removed useless macros and workarounds
API changes summary:
- WFIFOSET() can now be safely used both inside and outside socket.c
- RFIFOSKIP() can now be safely used both inside and outside socket.c
- do_close() is now sockt->close()
- flush_fifo() is now sockt->flush()
- flush_fifos() is now sockt->flush_fifos()
- getips() is now sockt->getips()
- host2ip() is now sockt->host2ip()
- ip2str() is now sockt->ip2str()
- ntows() is now sockt->ntows()
- make_connection() is now sockt->make_connection()
- make_listen_bind() is now sockt->make_listen_bind()
- realloc_fifo() is now sockt->realloc_fifo()
- realloc_writefifo() is now sockt->realloc_writefifo()
- session_isActive() is now sockt->session_is_active()
- session_isValid() is now sockt->session_is_valid()
- set_defaultparse() is now sockt->set_defaultparse()
- set_eof() is now sockt->eof()
- set_noblocking() is now sockt->set_noblocking()
- str2ip() is now sockt->str2ip()
Signed-off-by: Haru <haru@dotalux.com>
Diffstat (limited to 'src/map/pc.c')
-rw-r--r-- | src/map/pc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/pc.c b/src/map/pc.c index ad32217b8..04d597d81 100644 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -9014,7 +9014,7 @@ int pc_readregistry(struct map_session_data *sd, int64 reg) { ShowError("pc_readregistry: Trying to read reg %s before it's been loaded!\n", script->get_str(script_getvarid(reg))); //This really shouldn't happen, so it's possible the data was lost somewhere, we should request it again. //intif->request_registry(sd,type==3?4:type); - set_eof(sd->fd); + sockt->eof(sd->fd); return 0; } @@ -9035,7 +9035,7 @@ char* pc_readregistry_str(struct map_session_data *sd, int64 reg) { ShowError("pc_readregistry_str: Trying to read reg %s before it's been loaded!\n", script->get_str(script_getvarid(reg))); //This really shouldn't happen, so it's possible the data was lost somewhere, we should request it again. //intif->request_registry(sd,type==3?4:type); - set_eof(sd->fd); + sockt->eof(sd->fd); return NULL; } |