While I'm rooting around, note that we depend on sqlite3 now, not berkeley.

[mandoc.git] / manpath.c

diff --git a/manpath.c b/manpath.c
index b6d9574e3070da73c6c1f8c9bff790edf27949c7..e22aa9268a8c218ca32beac99e81a4186d49eb92 100644 (file)
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*     $Id: manpath.c,v 1.8 2011/12/24 22:37:16 kristaps Exp $ */
+/*     $Id: manpath.c,v 1.9 2012/06/08 10:32:40 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -74,7 +74,7 @@ manpath_parse(struct manpaths *dirs, const char *file,
 
        do {
                buf = mandoc_realloc(buf, bsz + 1024);
-               sz = fread(buf + (int)bsz, 1, 1024, stream);
+               sz = fread(buf + bsz, 1, 1024, stream);
                bsz += sz;
        } while (sz > 0);
 
@@ -117,7 +117,7 @@ manpath_parse(struct manpaths *dirs, const char *file,
        }
 
        /* Append man.conf(5) to MANPATH. */
-       if (':' == defp[(int)strlen(defp) - 1]) {
+       if (':' == defp[strlen(defp) - 1]) {
                manpath_parseline(dirs, defp);
                manpath_manconf(dirs, file);
                return;
@@ -162,7 +162,7 @@ manpath_add(struct manpaths *dirs, const char *dir)
 {
        char             buf[PATH_MAX];
        char            *cp;
-       int              i;
+       size_t           i;
 
        if (NULL == (cp = realpath(dir, buf)))
                return;
@@ -173,7 +173,7 @@ manpath_add(struct manpaths *dirs, const char *dir)
 
        dirs->paths = mandoc_realloc
                (dirs->paths,
-                ((size_t)dirs->sz + 1) * sizeof(char *));
+                (dirs->sz + 1) * sizeof(char *));
 
        dirs->paths[dirs->sz++] = mandoc_strdup(cp);
 }
@@ -181,7 +181,7 @@ manpath_add(struct manpaths *dirs, const char *dir)
 void
 manpath_free(struct manpaths *p)
 {
-       int              i;
+       size_t           i;
 
        for (i = 0; i < p->sz; i++)
                free(p->paths[i]);