summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael R Sweet <michaelrsweet@gmail.com>2016-03-24 18:00:11 -0400
committerMichael R Sweet <michaelrsweet@gmail.com>2016-03-24 18:00:11 -0400
commitf94124cb92b69884e012bbf989e6321a4dc1a79f (patch)
treeddc0fca9393590ee2b194c4d046575bb3226936a
parent840c1efb00788751fadf523ebeafad1890c1e0b9 (diff)
downloadcups-f94124cb92b69884e012bbf989e6321a4dc1a79f.tar.gz
Mirror fix from master.
-rw-r--r--scheduler/type.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/scheduler/type.c b/scheduler/type.c
index 68ed07e33..9cb012992 100644
--- a/scheduler/type.c
+++ b/scheduler/type.c
@@ -1,9 +1,7 @@
/*
- * "$Id: type.c 12577 2015-03-30 19:07:17Z msweet $"
- *
* MIME typing routines for CUPS.
*
- * Copyright 2007-2015 by Apple Inc.
+ * Copyright 2007-2016 by Apple Inc.
* Copyright 1997-2006 by Easy Software Products, all rights reserved.
*
* These coded instructions, statements, and computer programs are the
@@ -65,7 +63,8 @@ static const char * const debug_ops[] =
"INT", /* Integer/32-bit word matches */
"LOCALE", /* Current locale matches string */
"CONTAINS", /* File contains a string */
- "ISTRING" /* Case-insensitive string matches */
+ "ISTRING", /* Case-insensitive string matches */
+ "REGEX" /* Regular expression matches */
};
#endif /* DEBUG */
@@ -1276,8 +1275,3 @@ mime_patmatch(const char *s, /* I - String to match against */
return (*s == *pat);
}
-
-
-/*
- * End of "$Id: type.c 12577 2015-03-30 19:07:17Z msweet $".
- */