From: Jim Meyering <jim@meyering.net>
Date: Wed, 4 Jan 2006 07:12:22 +0000 (+0000)
Subject: Merge from glibc.
X-Git-Tag: v6.0~973
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27ab46340cc6c6b63424fe42e1045f39e3d4556a;p=thirdparty%2Fcoreutils.git

Merge from glibc.
(fts_open): Avoid function call in MAX macro use.
---

diff --git a/lib/fts.c b/lib/fts.c
index d119541efe..ed09697e05 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -1,6 +1,6 @@
 /* Traverse a file hierarchy.
 
-   Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -241,7 +241,8 @@ fts_open (char * const *argv,
 #ifndef MAXPATHLEN
 # define MAXPATHLEN 1024
 #endif
-	if (! fts_palloc(sp, MAX(fts_maxarglen(argv), MAXPATHLEN)))
+	size_t maxarglen = fts_maxarglen(argv);
+	if (! fts_palloc(sp, MAX(maxarglen, MAXPATHLEN)))
 		goto mem1;
 
 	/* Allocate/initialize root's parent. */