Minor clean-up after issue #43 fix.

This commit is contained in:
Andrew Johnson
2016-04-14 11:36:14 -05:00
parent 6dc9b0f96f
commit 0f61408a28
2 changed files with 16 additions and 36 deletions

View File

@@ -1,33 +1,12 @@
/**
* Copyright - See the COPYRIGHT that is included with this distribution.
* pvAccessCPP is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
*/
/*******************************************************************
* This implementation was adpoted from:
*
* Copyright (C) 1996, 1997, 1998, 1999, 2000 Florian Schintke
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA02111-1307 USA
*
* F.Schintke, the author of the original code, has authorized to
* distribute these files under LGPL License.
*
* ----------------------
* Implementation of the UN*X wildcards
* Supported wild-characters: '*', '?'; sets: [a-z], '!' negation
* Examples:
* '[a-g]l*i?n' matches 'florian'
* '[!abc]*e' matches 'smile'
* '[-z] matches 'a'
*
* Implementation of glob-style wildcard pattern matching.
* Supported wild-card characters: '*', '?'
*/
#ifndef WILDCARD_H
@@ -39,8 +18,8 @@ namespace epics {
namespace pvAccess {
/**
* Class which implements UNIX style wildcards and tests to see
* if strings match the wildcard.
* Class which implements wildcard patterns and checks to see
* if a string matches a given pattern.
*/
class epicsShareClass Wildcard
{
@@ -48,10 +27,10 @@ class epicsShareClass Wildcard
public:
/**
* This function implements the UN*X wildcards.
* @param wildcard Wildcard to be used.
* @param test Value which we want to see if it matches the wildcard.
* @return 0 if wildcard does not match *test. 1 - if wildcard
* This function implements wildcard pattern matching.
* @param wildcard Wildcard pattern to be used.
* @param test Value to test against the wildcard.
* @return 0 if wildcard does not match test. 1 - if wildcard
* matches test.
*/
static int wildcardfit (const char *wildcard, const char *test);

View File

@@ -4,9 +4,10 @@
* in file LICENSE that is included with this distribution.
*/
#include <epicsString.h>
#define epicsExportSharedSymbols
#include <pv/wildcard.h>
#include <epicsString.h>
using namespace epics::pvAccess;