Merge pull request #48 from oylbin/master

fix enet_packet_resize
zpl-c · Mar 1, 2024 · f849455 · f849455
2 parents 049a093 + 319d0e5
commit f849455
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/include/enet.h b/include/enet.h
@@ -254,7 +254,7 @@ extern "C" {
     extern void *enet_malloc(size_t);
     extern void enet_free(void *);
     extern ENetPacket* enet_packet_create(const void*,size_t,enet_uint32);
-    extern int enet_packet_resize(ENetPacket*, size_t);
+    extern ENetPacket* enet_packet_resize(ENetPacket*, size_t);
     extern ENetPacket* enet_packet_copy(ENetPacket*);
     extern void enet_packet_destroy(ENetPacket*);
 
@@ -1396,28 +1396,29 @@ extern "C" {
         dataLength parameter
         @param packet packet to resize
         @param dataLength new size for the packet data
-        @returns 0 on success, < 0 on failure
+        @returns new packet pointer on success, NULL on failure
     */
-    int enet_packet_resize(ENetPacket * packet, size_t dataLength)
+    ENetPacket* enet_packet_resize(ENetPacket * packet, size_t dataLength)
     {
         ENetPacket *newPacket = NULL;
 
         if (dataLength <= packet->dataLength || (packet->flags & ENET_PACKET_FLAG_NO_ALLOCATE))
         {
            packet->dataLength = dataLength;
 
-           return 0;
+           return packet;
         }
 
         newPacket = (ENetPacket *)enet_malloc(sizeof (ENetPacket) + dataLength);
         if (newPacket == NULL)
-          return -1;
+          return NULL;
 
         memcpy(newPacket, packet, sizeof(ENetPacket) + packet->dataLength);
         newPacket->data = (enet_uint8 *)newPacket + sizeof(ENetPacket);
+        newPacket->dataLength = dataLength;
         enet_free(packet);
 
-        return 0;
+        return newPacket;
     }
 
     ENetPacket *enet_packet_create_offset(const void *data, size_t dataLength, size_t dataOffset, enet_uint32 flags) {

diff --git a/misc/docs/tutorial.dox b/misc/docs/tutorial.dox
@@ -247,7 +247,7 @@ dispatching any events.
 
     /* Extend the packet so and append the string "foo", so it now */
     /* contains "packetfoo\0"                                      */
-    enet_packet_resize (packet, strlen ("packetfoo") + 1);
+    packet = enet_packet_resize (packet, strlen ("packetfoo") + 1);
     strcpy (& packet -> data [strlen ("packet")], "foo");
 
     /* Send the packet to the peer over channel id 0. */

diff --git a/test/resize.c b/test/resize.c
@@ -2,7 +2,15 @@
 #include "enet.h"
 int main() {
     ENetPacket *packet = enet_packet_create("packet",
-                                            strlen("packet") + 1,
+                                            strlen("packet"),
                                             ENET_PACKET_FLAG_RELIABLE);
-    enet_packet_resize(packet, strlen("packetfoo") + 1);
+    printf("length: %d, data: %.*s\n", packet->dataLength, packet->dataLength, (char*)packet->data);
+    packet = enet_packet_resize(packet, strlen("packetfoo"));
+    strcpy (& packet -> data [strlen ("packet")], "foo");
+    printf("length: %d, data: %.*s\n", packet->dataLength, packet->dataLength, (char*)packet->data);
+    packet = enet_packet_resize(packet, strlen("packet"));
+    printf("length: %d, data: %.*s\n", packet->dataLength, packet->dataLength, (char*)packet->data);
+    packet = enet_packet_resize(packet, strlen("packetfoobar"));
+    strcpy (& packet -> data [strlen ("packet")], "foobar");
+    printf("length: %d, data: %.*s\n", packet->dataLength, packet->dataLength, (char*)packet->data);
 }