summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorNicholas Marriott <nicm@cvs.openbsd.org>2015-05-29 14:15:42 +0000
committerNicholas Marriott <nicm@cvs.openbsd.org>2015-05-29 14:15:42 +0000
commitc6b96926ea963df4dd583667ee592e0081324c6f (patch)
tree2b2c8f6a39f090e8bc4ab36e7f8e872b21523d93 /usr.bin
parentb37ed498e906109ea558fa5d66c78953b699670d (diff)
I got confused and made the strength multiplier 20, it should be 10.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/file/magic-load.c4
-rw-r--r--usr.bin/file/magic.h4
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 <nicm@openbsd.org>
@@ -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 <nicm@openbsd.org>
@@ -31,7 +31,7 @@
#include <string.h>
#define MAGIC_STRING_SIZE 31
-#define MAGIC_STRENGTH_MULTIPLIER 20
+#define MAGIC_STRENGTH_MULTIPLIER 10
enum magic_type {
MAGIC_TYPE_NONE = 0,