summaryrefslogtreecommitdiffstats
path: root/usr.sbin/ckdist
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2008-11-19 00:09:01 +0000
committerdelphij <delphij@FreeBSD.org>2008-11-19 00:09:01 +0000
commit49f1cb9c3aa848254bb719646c93aeeb02b393f0 (patch)
treee51f83be29a50e0e9b692d3d03caff70e6fd0f78 /usr.sbin/ckdist
parentcec6c45f2362c0d2a28d10565c7e30ed9a705944 (diff)
downloadFreeBSD-src-49f1cb9c3aa848254bb719646c93aeeb02b393f0.zip
FreeBSD-src-49f1cb9c3aa848254bb719646c93aeeb02b393f0.tar.gz
Constify return value of stripath and avoid unnecessary deconst
casts.
Diffstat (limited to 'usr.sbin/ckdist')
-rw-r--r--usr.sbin/ckdist/ckdist.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/ckdist/ckdist.c b/usr.sbin/ckdist/ckdist.c
index 92bcd0d..dcaa9f3 100644
--- a/usr.sbin/ckdist/ckdist.c
+++ b/usr.sbin/ckdist/ckdist.c
@@ -80,7 +80,7 @@ static int chkinf(FILE * fp, const char *path);
static int report(const char *path, const char *name, int error);
static const char *distname(const char *path, const char *name,
const char *ext);
-static char *stripath(const char *path);
+static const char *stripath(const char *path);
static int distfile(const char *path);
static int disttype(const char *name);
static int fail(const char *path, const char *msg);
@@ -247,7 +247,7 @@ chkmd5(FILE * fp, const char *path)
error = E_ERRNO;
else if (close(fd))
err(2, "%s", dname);
- } else if (!MD5File((char *)dname, chk))
+ } else if (!MD5File(dname, chk))
error = E_ERRNO;
else if (strcmp(chk, sum))
error = E_CHKSUM;
@@ -393,12 +393,12 @@ distname(const char *path, const char *name, const char *ext)
return buf;
}
-static char *
+static const char *
stripath(const char *path)
{
const char *s;
- return (char *)((s = strrchr(path, '/')) != NULL && s[1] ?
+ return ((s = strrchr(path, '/')) != NULL && s[1] ?
s + 1 : path);
}
OpenPOWER on IntegriCloud