MIN() and MAX()

Author: michaelortmann

src/eggdrop.h

@@ -735,6 +735,13 @@ enum {
 #  define STRINGIFY1(x) #x
 #endif
 
+#ifndef MIN
+  #define MIN(a,b) (((a)<(b))?(a):(b))
+#endif
+#ifndef MAX
+  #define MAX(a,b) (((a)>(b))?(a):(b))
+#endif
+
 #ifdef EGG_TDNS
 #include <pthread.h>
 #define DTN_TYPE_HOSTBYIP 0

src/misc.c

@@ -597,11 +597,13 @@ void putlog (int type, char *chname, const char *format, ...)
             fputs(out, logs[i].f);
             size_t l = strlen(out + tsl);
             if (l > logs[i].szlast_len) {
-              if (!logs[i].szlast_len)
-                logs[i].szlast_len = 128;
-              else if (logs[i].szlast_len < LOGLINELEN)
+              if (!logs[i].szlast_len) {
+                logs[i].szlast_len = MIN(MAX(l, 128), LOGLINELEN);
+                logs[i].szlast = nrealloc(logs[i].szlast, logs[i].szlast_len);
+              } else if (logs[i].szlast_len < LOGLINELEN) {
                 logs[i].szlast_len = MIN(MAX(l, logs[i].szlast_len << 1), LOGLINELEN);
-              logs[i].szlast = nrealloc(logs[i].szlast, logs[i].szlast_len);
+                logs[i].szlast = nrealloc(logs[i].szlast, logs[i].szlast_len);
+              }
             }
             strlcpy(logs[i].szlast, out + tsl, logs[i].szlast_len);
           }

src/mod/server.mod/servmsg.c

@@ -1342,9 +1342,6 @@ static int tryauthenticate(char *from, char *msg)
   char *s;
   /* 400-byte chunk, see: https://ircv3.net/specs/extensions/sasl-3.1.html
    * base64 padding */
-  #ifndef MAX
-    #define MAX(a,b) (((a)>(b))?(a):(b))
-  #endif
   unsigned char dst[((MAX((sizeof src), 400) + 2) / 3) << 2] = "";
 #ifdef HAVE_EVP_PKEY_GET1_EC_KEY
   int olen;