philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch write_sockets() and read_sockets() from unsigned char * to char *

Browse Source
This commit is contained in:
Kevin Easton
2015-06-20 08:43:00 +10:00
parent 8649c17912
commit cce8b30079
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/misc.h
View File

@@ -139,8 +139,8 @@ ChannelList * BX_prepare_command (int *, char *, int);
void read_clonelist(int); void read_clonelist(int);
void read_clonenotify(int); void read_clonenotify(int);
void read_netfinger(int); void read_netfinger(int);
int BX_write_sockets(int, unsigned char *, int, int); int BX_write_sockets(int, char *, int, int);
int BX_read_sockets(int, unsigned char *, int); int BX_read_sockets(int, char *, int);
unsigned long BX_set_socketflags(int, unsigned long); unsigned long BX_set_socketflags(int, unsigned long);
void *BX_get_socketinfo(int); void *BX_get_socketinfo(int);
void BX_set_socketinfo(int, void *); void BX_set_socketinfo(int, void *);

4
include/modval.h
View File

@@ -582,8 +582,8 @@ extern Function_ptr *global;
#define set_socketflags (*(unsigned long (*)(int , unsigned long ))global[SET_SOCKETFLAGS]) #define set_socketflags (*(unsigned long (*)(int , unsigned long ))global[SET_SOCKETFLAGS])
#define get_socketflags (*(unsigned long (*)(int ))global[GET_SOCKETFLAGS]) #define get_socketflags (*(unsigned long (*)(int ))global[GET_SOCKETFLAGS])
#define check_socket (*(int (*)(int ))global[CHECK_SOCKET]) #define check_socket (*(int (*)(int ))global[CHECK_SOCKET])
#define read_sockets (*(int (*)(int , unsigned char *, int ))global[READ_SOCKETS]) #define read_sockets (*(int (*)(int , char *, int ))global[READ_SOCKETS])
#define write_sockets (*(int (*)(int , unsigned char *, int , int ))global[WRITE_SOCKETS]) #define write_sockets (*(int (*)(int , char *, int , int ))global[WRITE_SOCKETS])
#define get_max_fd (*(int (*)(void ))global[GET_MAX_FD]) #define get_max_fd (*(int (*)(void ))global[GET_MAX_FD])
#define new_close (*(int (*)(int ))global[NEW_CLOSE]) #define new_close (*(int (*)(int ))global[NEW_CLOSE])
#define new_open (*(int (*)(int ))global[NEW_OPEN]) #define new_open (*(int (*)(int ))global[NEW_OPEN])

6
source/misc.c
View File

@@ -3575,13 +3575,13 @@ int check_dcc_socket(int s)
return 0; return 0;
} }
int BX_write_sockets(int s, unsigned char *str, int len, int nl) int BX_write_sockets(int s, char *str, int len, int nl)
{ {
if (s < 1) if (s < 1)
return -1; return -1;
if (nl) if (nl)
{ {
unsigned char *buf; char *buf;
buf = alloca(strlen(str)+4); buf = alloca(strlen(str)+4);
strcpy(buf, str); strcpy(buf, str);
strcat(buf, "\r\n"); strcat(buf, "\r\n");
@@ -3591,7 +3591,7 @@ int BX_write_sockets(int s, unsigned char *str, int len, int nl)
return write(s, str, len); return write(s, str, len);
} }
int BX_read_sockets(int s, unsigned char *str, int len) int BX_read_sockets(int s, char *str, int len)
{ {
if (s < 1) if (s < 1)
return -1; return -1;