patch-2.4.10 linux/net/khttpd/rfc.c

• Lines: 39
• Date: Mon Sep 10 07:57:00 2001
• Orig file: v2.4.9/linux/net/khttpd/rfc.c
• Orig date: Mon Aug 27 12:41:49 2001

diff -u --recursive --new-file v2.4.9/linux/net/khttpd/rfc.c linux/net/khttpd/rfc.c
@@ -326,9 +326,9 @@
 			
 			strncpy(Head->FileName,sysctl_khttpd_docroot,sizeof(Head->FileName));
 			PrefixLen = strlen(sysctl_khttpd_docroot);
-			Head->FileNameLength = min(unsigned int, 255, tmp - Buffer + PrefixLen);		
+			Head->FileNameLength = min_t(unsigned int, 255, tmp - Buffer + PrefixLen);		
 			
-			strncat(Head->FileName,Buffer,min(unsigned int, 255 - PrefixLen, tmp - Buffer));
+			strncat(Head->FileName,Buffer,min_t(unsigned int, 255 - PrefixLen, tmp - Buffer));
 					
 			Buffer=EOL+1;	
 #ifdef BENCHMARK
@@ -341,7 +341,7 @@
 		{
 			Buffer+=19;
 			
-			strncpy(Head->IMS,Buffer,min(unsigned int, 127,EOL-Buffer-1));
+			strncpy(Head->IMS,Buffer,min_t(unsigned int, 127,EOL-Buffer-1));
 					
 			Buffer=EOL+1;	
 			continue;
@@ -351,7 +351,7 @@
 		{
 			Buffer+=12;
 			
-			strncpy(Head->Agent,Buffer,min(unsigned int, 127,EOL-Buffer-1));
+			strncpy(Head->Agent,Buffer,min_t(unsigned int, 127,EOL-Buffer-1));
 					
 			Buffer=EOL+1;	
 			continue;
@@ -362,7 +362,7 @@
 		{
 			Buffer+=6;
 			
-			strncpy(Head->Host,Buffer,min(unsigned int, 127,EOL-Buffer-1));
+			strncpy(Head->Host,Buffer,min_t(unsigned int, 127,EOL-Buffer-1));
 					
 			Buffer=EOL+1;	
 			continue;