oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

util/StringUtil: move strip functions to StringStrip.cxx

Browse Source
This commit is contained in:
Max Kellermann
2017-07-05 17:20:02 +02:00
parent dad7d7e798
commit 501a4af914
23 changed files with 199 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/util/DivideString.cxx
View File

@@ -18,7 +18,7 @@
*/
#include "DivideString.hxx"
#include "StringUtil.hxx"
#include "StringStrip.hxx"
#include <string.h>

2
src/util/SplitString.cxx
View File

@@ -29,7 +29,7 @@
#include "SplitString.hxx"
#include "IterableSplitString.hxx"
#include "StringUtil.hxx"
#include "StringStrip.hxx"
#include <string.h>

85
src/util/StringStrip.cxx Normal file
View File

@@ -0,0 +1,85 @@
/*
* Copyright (C) 2009-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "StringStrip.hxx"
#include "CharUtil.hxx"
#include <string.h>
const char *
StripLeft(const char *p) noexcept
{
while (IsWhitespaceNotNull(*p))
++p;
return p;
}
const char *
StripLeft(const char *p, const char *end) noexcept
{
while (p < end && IsWhitespaceOrNull(*p))
++p;
return p;
}
const char *
StripRight(const char *p, const char *end) noexcept
{
while (end > p && IsWhitespaceOrNull(end[-1]))
--end;
return end;
}
size_t
StripRight(const char *p, size_t length) noexcept
{
while (length > 0 && IsWhitespaceOrNull(p[length - 1]))
--length;
return length;
}
void
StripRight(char *p) noexcept
{
size_t old_length = strlen(p);
size_t new_length = StripRight(p, old_length);
p[new_length] = 0;
}
char *
Strip(char *p) noexcept
{
p = StripLeft(p);
StripRight(p);
return p;
}

95
src/util/StringStrip.hxx Normal file
View File

@@ -0,0 +1,95 @@
/*
* Copyright (C) 2009-2017 Max Kellermann <max.kellermann@gmail.com>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* - Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* - Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
* OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef STRING_STRIP_HXX
#define STRING_STRIP_HXX
#include "Compiler.h"
#include <stddef.h>
/**
* Returns a pointer to the first non-whitespace character in the
* string, or to the end of the string.
*/
gcc_pure
const char *
StripLeft(const char *p) noexcept;
gcc_pure
static inline char *
StripLeft(char *p) noexcept
{
return const_cast<char *>(StripLeft((const char *)p));
}
gcc_pure
const char *
StripLeft(const char *p, const char *end) noexcept;
/**
* Determine the string's end as if it was stripped on the right side.
*/
gcc_pure
const char *
StripRight(const char *p, const char *end) noexcept;
/**
* Determine the string's end as if it was stripped on the right side.
*/
gcc_pure
static inline char *
StripRight(char *p, char *end) noexcept
{
return const_cast<char *>(StripRight((const char *)p,
(const char *)end));
}
/**
* Determine the string's length as if it was stripped on the right
* side.
*/
gcc_pure
size_t
StripRight(const char *p, size_t length) noexcept;
/**
* Strip trailing whitespace by null-terminating the string.
*/
void
StripRight(char *p) noexcept;
/**
* Skip whitespace at the beginning and terminate the string after the
* last non-whitespace character.
*/
char *
Strip(char *p) noexcept;
#endif

53
src/util/StringUtil.cxx
View File

@@ -22,59 +22,6 @@
#include "ASCII.hxx"
#include <assert.h>
#include <string.h>
const char *
StripLeft(const char *p) noexcept
{
while (IsWhitespaceNotNull(*p))
++p;
return p;
}
const char *
StripLeft(const char *p, const char *end) noexcept
{
while (p < end && IsWhitespaceOrNull(*p))
++p;
return p;
}
const char *
StripRight(const char *p, const char *end) noexcept
{
while (end > p && IsWhitespaceOrNull(end[-1]))
--end;
return end;
}
size_t
StripRight(const char *p, size_t length) noexcept
{
while (length > 0 && IsWhitespaceOrNull(p[length - 1]))
--length;
return length;
}
void
StripRight(char *p) noexcept
{
size_t old_length = strlen(p);
size_t new_length = StripRight(p, old_length);
p[new_length] = 0;
}
char *
Strip(char *p) noexcept
{
p = StripLeft(p);
StripRight(p);
return p;
}
bool
StringArrayContainsCase(const char *const*haystack,

58
src/util/StringUtil.hxx
View File

@@ -24,64 +24,6 @@
#include <stddef.h>
/**
* Returns a pointer to the first non-whitespace character in the
* string, or to the end of the string.
*/
gcc_pure
const char *
StripLeft(const char *p) noexcept;
gcc_pure
static inline char *
StripLeft(char *p) noexcept
{
return const_cast<char *>(StripLeft((const char *)p));
}
gcc_pure
const char *
StripLeft(const char *p, const char *end) noexcept;
/**
* Determine the string's end as if it was stripped on the right side.
*/
gcc_pure
const char *
StripRight(const char *p, const char *end) noexcept;
/**
* Determine the string's end as if it was stripped on the right side.
*/
gcc_pure
static inline char *
StripRight(char *p, char *end) noexcept
{
return const_cast<char *>(StripRight((const char *)p,
(const char *)end));
}
/**
* Determine the string's length as if it was stripped on the right
* side.
*/
gcc_pure
size_t
StripRight(const char *p, size_t length) noexcept;
/**
* Strip trailing whitespace by null-terminating the string.
*/
void
StripRight(char *p) noexcept;
/**
* Skip whitespace at the beginning and terminate the string after the
* last non-whitespace character.
*/
char *
Strip(char *p) noexcept;
/**
* Checks whether a string array contains the specified string.
*

2
src/util/Tokenizer.cxx
View File

@@ -30,7 +30,7 @@
#include "config.h"
#include "Tokenizer.hxx"
#include "CharUtil.hxx"
#include "StringUtil.hxx"
#include "StringStrip.hxx"
#include <stdexcept>