From 0d6e116b9107813d7e07dbf94fa858b8c21776d3 Mon Sep 17 00:00:00 2001 From: nicm Date: Fri, 29 May 2015 14:15:41 +0000 Subject: [PATCH] I got confused and made the strength multiplier 20, it should be 10. --- usr.bin/file/magic-load.c | 4 ++-- usr.bin/file/magic.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr.bin/file/magic-load.c b/usr.bin/file/magic-load.c index 9d4480d6a8f..c68d4169dc1 100644 --- a/usr.bin/file/magic-load.c +++ b/usr.bin/file/magic-load.c @@ -1,4 +1,4 @@ -/* $OpenBSD: magic-load.c,v 1.4 2015/04/25 21:17:09 nicm Exp $ */ +/* $OpenBSD: magic-load.c,v 1.5 2015/05/29 14:15:41 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott @@ -287,7 +287,7 @@ magic_get_strength(struct magic_line *ml) if (ml->test_not || ml->test_operator == 'x') return (1); - n = 20; + n = 2 * MAGIC_STRENGTH_MULTIPLIER; switch (ml->type) { case MAGIC_TYPE_NONE: case MAGIC_TYPE_DEFAULT: diff --git a/usr.bin/file/magic.h b/usr.bin/file/magic.h index 3ee8331e0f5..5095b7bd99f 100644 --- a/usr.bin/file/magic.h +++ b/usr.bin/file/magic.h @@ -1,4 +1,4 @@ -/* $OpenBSD: magic.h,v 1.5 2015/04/24 16:24:11 nicm Exp $ */ +/* $OpenBSD: magic.h,v 1.6 2015/05/29 14:15:41 nicm Exp $ */ /* * Copyright (c) 2015 Nicholas Marriott @@ -31,7 +31,7 @@ #include #define MAGIC_STRING_SIZE 31 -#define MAGIC_STRENGTH_MULTIPLIER 20 +#define MAGIC_STRENGTH_MULTIPLIER 10 enum magic_type { MAGIC_TYPE_NONE = 0, -- 2.20.1