LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 12:40:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace (C99/C++11) snprintf with lua_pushfstring

Browse Source
This commit is contained in:
Bart van Strien
2013-07-10 16:24:29 +02:00
parent e6b029ec90
commit 29fd6b98f8
1 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libraries/enet/enet.cpp
+3 -25
View File
@@ -253,22 +253,10 @@ static int host_create(lua_State *l) {
} }
static int linked_version(lua_State *l) { static int linked_version(lua_State *l) {
char* enet_version_str = (char*) malloc (sizeof(char) * 32); lua_pushfstring(l, "%d.%d.%d",
if (enet_version_str == NULL) {
luaL_error(l, "Error allocating memory for version string.");
}
snprintf (enet_version_str, sizeof(char) * 32, "%d.%d.%d",
ENET_VERSION_GET_MAJOR(enet_linked_version()), ENET_VERSION_GET_MAJOR(enet_linked_version()),
ENET_VERSION_GET_MINOR(enet_linked_version()), ENET_VERSION_GET_MINOR(enet_linked_version()),
ENET_VERSION_GET_PATCH(enet_linked_version()) ENET_VERSION_GET_PATCH(enet_linked_version()));
);
lua_pushstring (l, enet_version_str);
free (enet_version_str);
return 1; return 1;
} }
@@ -400,22 +388,12 @@ static int host_socket_get_address(lua_State *l) {
ENetAddress address; ENetAddress address;
enet_socket_get_address (host->socket, &address); enet_socket_get_address (host->socket, &address);
char* address_str = (char *) malloc(sizeof(char) * 64); lua_pushfstring(l, "%d.%d.%d.%d:%d",
if (address_str == NULL) {
luaL_error(l, "Error allocating memory for address string.");
}
snprintf (address_str, sizeof(char) * 64, "%d.%d.%d.%d:%d",
((address.host) & 0xFF), ((address.host) & 0xFF),
((address.host >> 8) & 0xFF), ((address.host >> 8) & 0xFF),
((address.host >> 16) & 0xFF), ((address.host >> 16) & 0xFF),
(address.host >> 24& 0xFF), (address.host >> 24& 0xFF),
address.port); address.port);
lua_pushstring(l, address_str);
free (address_str);
return 1; return 1;
} }
static int host_total_sent_data(lua_State *l) { static int host_total_sent_data(lua_State *l) {