Make max() an inline function.

[utcp] / utcp.c

diff --git a/utcp.c b/utcp.c
index 607af2d149ee9242646d3f1a97638ecb64e01078..fc147c295208631454682640fd6e30384b29bf26 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -53,9 +53,9 @@
 } while (0)
 #endif
 
-#ifndef max
-#define max(a, b) ((a) > (b) ? (a) : (b))
-#endif
+static inline size_t max(size_t a, size_t b) {
+       return a > b ? a : b;
+}
 
 #ifdef UTCP_DEBUG
 #include <stdarg.h>
@@ -88,6 +88,10 @@ static void print_packet(struct utcp *utcp, const char *dir, const void *pkt, si
        if(len > sizeof hdr) {
                uint32_t datalen = len - sizeof hdr;
                uint8_t *str = malloc((datalen << 1) + 7);
+               if(!str) {
+                       debug("out of memory");
+                       return;
+               }
                memcpy(str, " data=", 6);
                uint8_t *strptr = str + 6;
                const uint8_t *data = pkt;