TheCloneArmy/mcrcon
1
0
Fork 0
mirror of https://github.com/Tiiffi/mcrcon.git synced 2025-10-28 03:41:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added packet_build_malloc() forward declaration and type cast to 2nd argument of send() function to silence windows compiler warnings.

Browse Source
This commit is contained in:
Tiiffi
2016-10-28 03:21:16 +03:00
parent 3e60b0d28f
commit edc750ccef
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mcrcon.c
View File

@ -86,10 +86,8 @@ void net_init_WSA(void);
void net_close(int sd); void net_close(int sd);
int net_connect(const char *host, const char *port); int net_connect(const char *host, const char *port);
int net_send(int sd, const uint8_t *buffer, size_t size); int net_send(int sd, const uint8_t *buffer, size_t size);
int net_send_packet(int sd, rc_packet *packet); int net_send_packet(int sd, rc_packet *packet);
rc_packet* net_recv_packet(int sd); rc_packet* net_recv_packet(int sd);
int net_clean_incoming(int sd, int size); int net_clean_incoming(int sd, int size);
// Other stuff // Other stuff
@ -100,6 +98,7 @@ void print_color(int color);
#endif #endif
rc_packet* packet_build(int id, int cmd, char *s1); rc_packet* packet_build(int id, int cmd, char *s1);
uint8_t *packet_build_malloc(size_t *size, int32_t id, int32_t cmd, char *string);
void packet_print(rc_packet *packet); void packet_print(rc_packet *packet);
int rcon_auth(int rsock, char *passwd); int rcon_auth(int rsock, char *passwd);
@ -361,14 +360,14 @@ int net_connect(const char *host, const char *port)
return sd; return sd;
} }
int net_send(int sd, const uint8_t *buffer, size_t size) int net_send(int sd, const uint8_t *buff, size_t size)
{ {
size_t sent = 0; size_t sent = 0;
size_t left = size; size_t left = size;
while (sent < size) while (sent < size)
{ {
int result = send(sd, buffer + sent, left, 0); int result = send(sd, (const char *) buff + sent, left, 0);
if (result == -1) return -1; if (result == -1) return -1;
@ -632,7 +631,7 @@ struct rcon_packet packet_build_new(int32_t id, int32_t cmd, char *string)
string_length = MAX_STRING_SIZE; string_length = MAX_STRING_SIZE;
fprintf(stderr, fprintf(stderr,
"Warning: command string is too long. Truncating to " "Warning: command string is too long. Truncating to "
"%d characters.\n", MAX_STRING_SIZE "%u characters.\n", MAX_STRING_SIZE
); );
} }