diff options
| author | dim <dim@FreeBSD.org> | 2014-12-11 19:27:27 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2014-12-11 19:27:27 +0000 |
| commit | da65ea02a341dd797c46b6987753bc1453982b36 (patch) | |
| tree | d9a72217c1d2c4dcfef27a2fd2078dd4b3f69a64 /contrib/file/src/encoding.c | |
| parent | 4cba228708753c1128b75a2c25c0dda582a9913a (diff) | |
| parent | dc1c036751105b0a801375ba642278a13543bf7c (diff) | |
| download | FreeBSD-src-da65ea02a341dd797c46b6987753bc1453982b36.zip FreeBSD-src-da65ea02a341dd797c46b6987753bc1453982b36.tar.gz | |
Merge ^/head r275685 through r275714.
Diffstat (limited to 'contrib/file/src/encoding.c')
| -rw-r--r-- | contrib/file/src/encoding.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/contrib/file/src/encoding.c b/contrib/file/src/encoding.c index b75e0cc..c1b23cc 100644 --- a/contrib/file/src/encoding.c +++ b/contrib/file/src/encoding.c @@ -35,7 +35,7 @@ #include "file.h" #ifndef lint -FILE_RCSID("@(#)$File: encoding.c,v 1.9 2013/11/19 20:45:50 christos Exp $") +FILE_RCSID("@(#)$File: encoding.c,v 1.10 2014/09/11 12:08:52 christos Exp $") #endif /* lint */ #include "magic.h" @@ -97,7 +97,6 @@ file_encoding(struct magic_set *ms, const unsigned char *buf, size_t nbytes, uni *code_mime = "utf-8"; } else if (file_looks_utf8(buf, nbytes, *ubuf, ulen) > 1) { DPRINTF(("utf8 %" SIZE_T_FORMAT "u\n", *ulen)); - *code = "UTF-8 Unicode (with BOM)"; *code = "UTF-8 Unicode"; *code_mime = "utf-8"; } else if ((ucs_type = looks_ucs16(buf, nbytes, *ubuf, ulen)) != 0) { |
