diff options
| author |   guenther <guenther@openbsd.org> | 2012-11-29 02:15:44 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2012-11-29 02:15:44 +0000 |
| commit | a737da78244b7083cf46696406625dd05c33eafa (patch) | |
| tree | 4d2b2009264ea914ac361e9067525a99b1abeb74 /usr.sbin/lpr | |
| parent | Fix white spaces in relayd. No binary diff. (diff) | |
| download | wireguard-openbsd-a737da78244b7083cf46696406625dd05c33eafa.tar.xz wireguard-openbsd-a737da78244b7083cf46696406625dd05c33eafa.zip | |
Change scandir()'s 'select' argument from
int (*)(struct dirent *)
to
int (*)(const struct dirent *)
to match POSIX.
ok millert@, ports check by naddy@
Diffstat (limited to 'usr.sbin/lpr')
| -rw-r--r-- | usr.sbin/lpr/common_source/lp.h | 4 | ||||
| -rw-r--r-- | usr.sbin/lpr/common_source/rmjob.c | 4 | ||||
| -rw-r--r-- | usr.sbin/lpr/lpc/cmds.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/lpr/common_source/lp.h b/usr.sbin/lpr/common_source/lp.h index 09f914f976c..0ba45de74eb 100644 --- a/usr.sbin/lpr/common_source/lp.h +++ b/usr.sbin/lpr/common_source/lp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: lp.h,v 1.15 2012/03/04 04:05:15 fgsch Exp $ */ +/* $OpenBSD: lp.h,v 1.16 2012/11/29 02:15:44 guenther Exp $ */ /* $NetBSD: lp.h,v 1.14 2000/04/16 14:43:58 mrg Exp $ */ /* @@ -135,7 +135,7 @@ int getport(char *, int); int getq(struct queue ***); void header(void); int inlist(char *, char *); -int iscf(struct dirent *); +int iscf(const struct dirent *); int isowner(char *, char *); void ldump(char *, char *, int); void prank(int); diff --git a/usr.sbin/lpr/common_source/rmjob.c b/usr.sbin/lpr/common_source/rmjob.c index 526523c7b4d..54d9f8a5333 100644 --- a/usr.sbin/lpr/common_source/rmjob.c +++ b/usr.sbin/lpr/common_source/rmjob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rmjob.c,v 1.19 2012/03/04 04:05:15 fgsch Exp $ */ +/* $OpenBSD: rmjob.c,v 1.20 2012/11/29 02:15:44 guenther Exp $ */ /* $NetBSD: rmjob.c,v 1.16 2000/04/16 14:43:58 mrg Exp $ */ /* @@ -393,7 +393,7 @@ alarmer(int s) * Return 1 if the filename begins with 'cf' */ int -iscf(struct dirent *d) +iscf(const struct dirent *d) { return(d->d_name[0] == 'c' && d->d_name[1] == 'f'); } diff --git a/usr.sbin/lpr/lpc/cmds.c b/usr.sbin/lpr/lpc/cmds.c index c9a444b59ae..7fe784578c9 100644 --- a/usr.sbin/lpr/lpc/cmds.c +++ b/usr.sbin/lpr/lpc/cmds.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmds.c,v 1.23 2012/03/22 01:44:19 guenther Exp $ */ +/* $OpenBSD: cmds.c,v 1.24 2012/11/29 02:15:44 guenther Exp $ */ /* $NetBSD: cmds.c,v 1.12 1997/10/05 15:12:06 mrg Exp $ */ /* @@ -59,7 +59,7 @@ static void abortpr(int); static void cleanpr(void); static void disablepr(void); static int doarg(char *); -static int doselect(struct dirent *); +static int doselect(const struct dirent *); static void enablepr(void); static void prstat(void); static void putmsg(int, char **); @@ -251,7 +251,7 @@ clean(int argc, char **argv) } static int -doselect(struct dirent *d) +doselect(const struct dirent *d) { int c = d->d_name[0]; |