From 05903dc56faf232b8f5a3eee3b049225db81a551 Mon Sep 17 00:00:00 2001 From: Chris Pressey Date: Fri, 4 Mar 2005 06:06:57 +0000 Subject: [PATCH] Small step towards WARNS=6: - Rename function parameters to avoid conflict with globals. - Constify a local char *. --- lib/libutil/uucplock.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/libutil/uucplock.c b/lib/libutil/uucplock.c index d687960440..f592301f27 100644 --- a/lib/libutil/uucplock.c +++ b/lib/libutil/uucplock.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * $FreeBSD: src/lib/libutil/uucplock.c,v 1.12.2.1 2000/10/09 20:20:52 brian Exp $ - * $DragonFly: src/lib/libutil/uucplock.c,v 1.3 2005/03/04 04:31:11 cpressey Exp $ + * $DragonFly: src/lib/libutil/uucplock.c,v 1.4 2005/03/04 06:06:57 cpressey Exp $ * * @(#)uucplock.c 8.1 (Berkeley) 6/6/93 */ @@ -67,7 +67,7 @@ static pid_t get_pid (int fd,int *err); */ int -uu_lock(const char *ttyname) +uu_lock(const char *tty_name) { int fd, tmpfd, i; pid_t pid, pid_old; @@ -79,7 +79,7 @@ uu_lock(const char *ttyname) (void)snprintf(lcktmpname, sizeof(lcktmpname), _PATH_UUCPLOCK LOCKTMP, pid); (void)snprintf(lckname, sizeof(lckname), _PATH_UUCPLOCK LOCKFMT, - ttyname); + tty_name); if ((tmpfd = creat(lcktmpname, 0664)) < 0) GORET(0, UU_LOCK_CREAT_ERR); @@ -129,12 +129,12 @@ ret0: } int -uu_lock_txfr(const char *ttyname, pid_t pid) +uu_lock_txfr(const char *tty_name, pid_t pid) { int fd, err; char lckname[sizeof(_PATH_UUCPLOCK) + MAXNAMLEN]; - snprintf(lckname, sizeof(lckname), _PATH_UUCPLOCK LOCKFMT, ttyname); + snprintf(lckname, sizeof(lckname), _PATH_UUCPLOCK LOCKFMT, tty_name); if ((fd = open(lckname, O_RDWR)) < 0) return UU_LOCK_OWNER_ERR; @@ -150,11 +150,11 @@ uu_lock_txfr(const char *ttyname, pid_t pid) } int -uu_unlock(const char *ttyname) +uu_unlock(const char *tty_name) { char tbuf[sizeof(_PATH_UUCPLOCK) + MAXNAMLEN]; - (void)snprintf(tbuf, sizeof(tbuf), _PATH_UUCPLOCK LOCKFMT, ttyname); + (void)snprintf(tbuf, sizeof(tbuf), _PATH_UUCPLOCK LOCKFMT, tty_name); return unlink(tbuf); } @@ -162,7 +162,7 @@ const char * uu_lockerr(int uu_lockresult) { static char errbuf[128]; - char *fmt; + const char *fmt; switch (uu_lockresult) { case UU_LOCK_INUSE: -- 2.41.0