X-Git-Url: https://git.cameronkatri.com/mandoc.git/blobdiff_plain/f860cf56ff373daca5cc5c911a731f157674f2b1..fa097d3df280b2adb39ec3b99fd44d324aa2fbb1:/preconv.c diff --git a/preconv.c b/preconv.c index 59c34349..a53504ec 100644 --- a/preconv.c +++ b/preconv.c @@ -1,4 +1,4 @@ -/* $Id: preconv.c,v 1.3 2011/05/26 14:43:07 kristaps Exp $ */ +/* $Id: preconv.c,v 1.4 2011/05/26 21:13:07 kristaps Exp $ */ /* * Copyright (c) 2011 Kristaps Dzonsons * @@ -137,7 +137,7 @@ conv_utf_8(const struct buf *b) /* Quick test for big-endian value. */ - if ( ! (*((char *)(&one)))) + if ( ! (*((const char *)(&one)))) be = 1; for (i = b->offs; i < b->sz; i++) { @@ -376,7 +376,7 @@ cue_enc(const struct buf *b, size_t *offs, enum enc *enc) /* Check us against known encodings. */ - for (i = 0; i < ENC__MAX; i++) { + for (i = 0; i < (int)ENC__MAX; i++) { nsz = strlen(encs[i].name); if (phsz < nsz) continue; @@ -403,7 +403,7 @@ main(int argc, char *argv[]) struct buf b; const char *fn; enum enc enc, def; - const char bom[3] = { 0xEF, 0xBB, 0xBF }; + unsigned char bom[3] = { 0xEF, 0xBB, 0xBF }; size_t offs; extern int optind; extern char *optarg; @@ -427,12 +427,12 @@ main(int argc, char *argv[]) case ('D'): /* FALLTHROUGH */ case ('e'): - for (i = 0; i < ENC__MAX; i++) { + for (i = 0; i < (int)ENC__MAX; i++) { if (strcasecmp(optarg, encs[i].name)) continue; break; } - if (i < ENC__MAX) { + if (i < (int)ENC__MAX) { if ('D' == ch) def = (enum enc)i; else