diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2010-09-24 13:56:33 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2010-09-24 13:56:33 +0000 |
| commit | dcb9eb1a31c27c0e117e789a70cf90dbff80e238 (patch) | |
| tree | 84bd4391431bcc592eed1da54a7593808950d1e4 /lib | |
| parent | b0afb2a37a97f867b914595794440393a757146a (diff) | |
Bump fts_level from short to int and add a spare short so things
line up nicely. OK deraadt@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/gen/fts.3 | 6 | ||||
| -rw-r--r-- | lib/libc/gen/fts.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/gen/fts.3 b/lib/libc/gen/fts.3 index 1ec32b6d33d..e81834df98e 100644 --- a/lib/libc/gen/fts.3 +++ b/lib/libc/gen/fts.3 @@ -1,4 +1,4 @@ -.\" $OpenBSD: fts.3,v 1.27 2009/11/27 20:12:34 otto Exp $ +.\" $OpenBSD: fts.3,v 1.28 2010/09/24 13:56:32 millert Exp $ .\" .\" Copyright (c) 1989, 1991, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)fts.3 8.5 (Berkeley) 4/16/94 .\" -.Dd $Mdocdate: November 27 2009 $ +.Dd $Mdocdate: September 24 2010 $ .Dt FTS 3 .Os .Sh NAME @@ -117,7 +117,7 @@ typedef struct _ftsent { size_t fts_pathlen; /* strlen(fts_path) */ char *fts_name; /* file name */ size_t fts_namelen; /* strlen(fts_name) */ - short fts_level; /* depth (-1 to N) */ + int fts_level; /* depth (-1 to N) */ int fts_errno; /* file errno */ long fts_number; /* local numeric value */ void *fts_pointer; /* local address value */ diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index bbc1dc7475b..8b12b45b20a 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fts.c,v 1.43 2009/08/27 16:19:27 millert Exp $ */ +/* $OpenBSD: fts.c,v 1.44 2010/09/24 13:56:32 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -634,7 +634,7 @@ fts_build(FTS *sp, int type) maxlen = sp->fts_pathlen - len; /* - * fts_level is a short so we must prevent it from wrapping + * fts_level is signed so we must prevent it from wrapping * around to FTS_ROOTLEVEL and FTS_ROOTPARENTLEVEL. */ level = cur->fts_level; |