From 27ab46340cc6c6b63424fe42e1045f39e3d4556a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 4 Jan 2006 07:12:22 +0000 Subject: Merge from glibc. (fts_open): Avoid function call in MAX macro use. --- lib/fts.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/fts.c b/lib/fts.c index d119541ef..ed09697e0 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. */ -- cgit v1.2.3-70-g09d2