<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-legacy-support.
</pre>
<p><a href="https://github.com/macports/macports-legacy-support/commit/455c9e320cf11b1eedcc88e68bb8e2ab746b9841">https://github.com/macports/macports-legacy-support/commit/455c9e320cf11b1eedcc88e68bb8e2ab746b9841</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 455c9e320cf11b1eedcc88e68bb8e2ab746b9841
</span>Author: Fred Wright <fw@fwright.net>
AuthorDate: Wed Feb 19 20:49:56 2025 -0800
<span style='display:block; white-space:pre;color:#404040;'> dirent.h: Fix possible "shadowing" warnings.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since 'dirname' and 'select' are function names, some compilers may
</span><span style='display:block; white-space:pre;color:#404040;'> complain about using them as parameter names. Rename them to avoid
</span><span style='display:block; white-space:pre;color:#404040;'> this.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> TESTED:
</span><span style='display:block; white-space:pre;color:#404040;'> Tests (with -Wshadow) now build without shadowing warnings.
</span>---
include/dirent.h | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/include/dirent.h b/include/dirent.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a8b23c..02d8a47 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/include/dirent.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/include/dirent.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,6 +93,9 @@ __MP__END_DECLS
</span> * without the need for (direct) awareness of SDK versions. This macro
* is defined for all SDK versions, but only nonzero when the signature
* issue exists.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * NOTE: We need to avoid using 'dirname' as a parameter name, since some
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * compilers may complain about "shadowing" the 'dirname' function.
</span> */
__MP__BEGIN_DECLS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -108,12 +111,12 @@ __mpls_alphasort(const struct dirent **d1, const struct dirent **d2)
</span> }
static inline int
<span style='display:block; white-space:pre;background:#ffe0e0;'>-__mpls_scandir(const char *dirname, struct dirent ***namelist,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int (*select)(const struct dirent *),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+__mpls_scandir(const char *dirnam, struct dirent ***namelist,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*selector)(const struct dirent *),
</span> int (*compar)(const struct dirent **, const struct dirent **))
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return scandir(dirname, namelist,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (int (*)(struct dirent *)) select,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return scandir(dirnam, namelist,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (int (*)(struct dirent *)) selector,
</span> (int (*)(const void *, const void *)) compar);
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,11 +140,11 @@ __mpls_alphasort(const struct dirent **d1, const struct dirent **d2)
</span> }
static inline int
<span style='display:block; white-space:pre;background:#ffe0e0;'>-__mpls_scandir(const char *dirname, struct dirent ***namelist,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int (*select)(const struct dirent *),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+__mpls_scandir(const char *dirnam, struct dirent ***namelist,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int (*selector)(const struct dirent *),
</span> int (*compar)(const struct dirent **, const struct dirent **))
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return scandir(dirname, namelist, select, compar);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return scandir(dirnam, namelist, selector, compar);
</span> }
#endif /* !__MPLS_SDK_SUPPORT_NEW_SCANDIR__ */
</pre><pre style='margin:0'>
</pre>