Browse code

add missing MAX macro

git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@1274 77e5149b-7576-45b1-b177-96237e5ba77b

Tomasz Kojm authored on 2005/01/26 17:28:48
Showing 2 changed files
... ...
@@ -1,3 +1,8 @@
1
+Wed Jan 26 09:23:48 CET 2005 (tk)
2
+---------------------------------
3
+  * libclamav/snprintf.c: add missing MAX macro (thanks to Ted Mittelstaedt
4
+			  <tedm*toybox.placo.com>)
5
+
1 6
 Tue Jan 25 08:12:51 GMT 2005 (njh)
2 7
 ----------------------------------
3 8
   * clamav-milter:	Internal mode is now the default. Removed --internal
... ...
@@ -120,6 +120,9 @@ dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c);
120 120
 #define char_to_int(p) (p - '0')
121 121
 #define abs_val(p) (p < 0 ? -p : p)
122 122
 
123
+#ifndef MAX
124
+#define MAX(a,b) ((a > b) ? a : b)
125
+#endif
123 126
 
124 127
 static void 
125 128
 dopr(char *buffer, size_t maxlen, const char *format, va_list args)
... ...
@@ -435,7 +438,7 @@ fmtint(char *buffer, size_t *currlen, size_t maxlen,
435 435
 	convert[place] = 0;
436 436
 
437 437
 	zpadlen = max - place;
438
-	spadlen = min - MAX (max, place) - (signvalue ? 1 : 0);
438
+	spadlen = min - MAX(max, place) - (signvalue ? 1 : 0);
439 439
 	if (zpadlen < 0)
440 440
 		zpadlen = 0;
441 441
 	if (spadlen < 0)