diff options
| -rw-r--r-- | main.c | 8 | ||||
| -rw-r--r-- | preconv.c | 4 |
2 files changed, 7 insertions, 5 deletions
@@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.222 2015/02/27 16:02:10 schwarze Exp $ */ +/* $Id: main.c,v 1.223 2015/03/06 09:24:59 kristaps Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -303,18 +303,20 @@ main(int argc, char *argv[]) argc = 1; } } else if (argc > 1 && - ((uc = argv[0]) != NULL) && + ((uc = (unsigned char *)argv[0]) != NULL) && ((isdigit(uc[0]) && (uc[1] == '\0' || (isalpha(uc[1]) && uc[2] == '\0'))) || (uc[0] == 'n' && uc[1] == '\0'))) { - search.sec = uc; + search.sec = (char *)uc; argv++; argc--; } if (search.arch == NULL) search.arch = getenv("MACHINE"); +#ifdef MACHINE if (search.arch == NULL) search.arch = MACHINE; +#endif } rc = MANDOCLEVEL_OK; @@ -1,4 +1,4 @@ -/* $Id: preconv.c,v 1.13 2014/12/19 04:58:35 schwarze Exp $ */ +/* $Id: preconv.c,v 1.14 2015/03/06 09:24:59 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -33,7 +33,7 @@ preconv_encode(struct buf *ib, size_t *ii, struct buf *ob, size_t *oi, int nby; unsigned int accum; - cu = ib->buf + *ii; + cu = (unsigned char *)ib->buf + *ii; assert(*cu & 0x80); if ( ! (*filenc & MPARSE_UTF8)) |