40c40
< __FBSDID("$FreeBSD: head/lib/libc/gen/fts-compat.c 129052 2004-05-08 15:09:02Z peadar $");
---
> __FBSDID("$FreeBSD: head/lib/libc/gen/fts-compat.c 129161 2004-05-12 21:38:39Z peadar $");
43d42
< #include <sys/types.h>
45d43
< #include <sys/stat.h>
46a45
> #include <sys/stat.h>
67c66
< static int fts_ufslinks(FTS *sp, const FTSENT *ent);
---
> static int fts_ufslinks(FTS *, const FTSENT *);
83,86c82,84
< * Internal representation of FTS, including extra implementation details.
< * The FTS returned from fts_open is ftsp_fts from this structure, and it's
< * fts_priv in turn points back to this internal version. i.e. for a given
< * fts_private *priv: &priv->fts_fts == (FTS *)f == priv->fts_fts.fts_priv
---
> * Internal representation of an FTS, including extra implementation
> * details. The FTS returned from fts_open points to this structure's
> * ftsp_fts member (and can be cast to an _fts_private as required)
89,92c87,90
< FTS ftsp_fts;
< struct statfs ftsp_statfs;
< dev_t ftsp_dev;
< int ftsp_linksreliable;
---
> FTS ftsp_fts;
> struct statfs ftsp_statfs;
> dev_t ftsp_dev;
> int ftsp_linksreliable;
96,101c94,99
< * The "FTS_NOSTAT" option can avoid a lot of calls to stat(2) if it knows
< * that a directory could not possibly have subdirectories. This is decided
< * by looking at the link count: A subdirectory would increment its parent's
< * link count by virtue of its own ".." entry.
< * This assumption only holds for UFS-like filesystems that implement links
< * and directories this way, so we must punt for others.
---
> * The "FTS_NOSTAT" option can avoid a lot of calls to stat(2) if it
> * knows that a directory could not possibly have subdirectories. This
> * is decided by looking at the link count: a subdirectory would
> * increment its parent's link count by virtue of its own ".." entry.
> * This assumption only holds for UFS-like filesystems that implement
> * links and directories this way, so we must punt for others.
132c130
< if ((priv = malloc(sizeof(struct _fts_private))) == NULL)
---
> if ((priv = malloc(sizeof(*priv))) == NULL)
134c132
< memset(priv, 0, sizeof(struct _fts_private));
---
> memset(priv, 0, sizeof(*priv));
138d135
< sp->fts_priv = priv;
1205c1202
< priv = sp->fts_priv;
---
> priv = (struct _fts_private *)sp;
1227c1224
< return priv->ftsp_linksreliable;
---
> return (priv->ftsp_linksreliable);