Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
b39ab761
Commit
b39ab761
authored
Oct 19, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Util/CharUtil: new library replacing g_ascii_isX()
parent
90777f78
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
134 additions
and
17 deletions
+134
-17
ClientMessage.cxx
src/ClientMessage.cxx
+2
-3
LogInit.cxx
src/LogInit.cxx
+2
-1
TextInputStream.cxx
src/TextInputStream.cxx
+2
-3
CueParser.cxx
src/cue/CueParser.cxx
+3
-2
CurlInputPlugin.cxx
src/input/CurlInputPlugin.cxx
+3
-2
CharUtil.hxx
src/util/CharUtil.hxx
+114
-0
StringUtil.cxx
src/util/StringUtil.cxx
+2
-1
Tokenizer.cxx
src/util/Tokenizer.cxx
+6
-5
No files found.
src/ClientMessage.cxx
View file @
b39ab761
...
@@ -18,15 +18,14 @@
...
@@ -18,15 +18,14 @@
*/
*/
#include "ClientMessage.hxx"
#include "ClientMessage.hxx"
#include "util/CharUtil.hxx"
#include "Compiler.h"
#include "Compiler.h"
#include <glib.h>
gcc_const
gcc_const
static
bool
static
bool
valid_channel_char
(
const
char
ch
)
valid_channel_char
(
const
char
ch
)
{
{
return
g_ascii_isalnum
(
ch
)
||
return
IsAlphaNumericASCII
(
ch
)
||
ch
==
'_'
||
ch
==
'-'
||
ch
==
'.'
||
ch
==
':'
;
ch
==
'_'
||
ch
==
'-'
||
ch
==
'.'
||
ch
==
':'
;
}
}
...
...
src/LogInit.cxx
View file @
b39ab761
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
#include "fs/FileSystem.hxx"
#include "fs/FileSystem.hxx"
#include "util/Error.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "util/Domain.hxx"
#include "util/CharUtil.hxx"
#include "system/FatalError.hxx"
#include "system/FatalError.hxx"
#include <assert.h>
#include <assert.h>
...
@@ -89,7 +90,7 @@ chomp_length(const char *p)
...
@@ -89,7 +90,7 @@ chomp_length(const char *p)
{
{
size_t
length
=
strlen
(
p
);
size_t
length
=
strlen
(
p
);
while
(
length
>
0
&&
g_ascii_isspace
(
p
[
length
-
1
]))
while
(
length
>
0
&&
IsWhitespaceOrNull
(
p
[
length
-
1
]))
--
length
;
--
length
;
return
(
int
)
length
;
return
(
int
)
length
;
...
...
src/TextInputStream.cxx
View file @
b39ab761
...
@@ -20,12 +20,11 @@
...
@@ -20,12 +20,11 @@
#include "config.h"
#include "config.h"
#include "TextInputStream.hxx"
#include "TextInputStream.hxx"
#include "InputStream.hxx"
#include "InputStream.hxx"
#include "util/CharUtil.hxx"
#include "util/fifo_buffer.h"
#include "util/fifo_buffer.h"
#include "util/Error.hxx"
#include "util/Error.hxx"
#include "Log.hxx"
#include "Log.hxx"
#include <glib.h>
#include <assert.h>
#include <assert.h>
#include <string.h>
#include <string.h>
...
@@ -71,7 +70,7 @@ bool TextInputStream::ReadLine(std::string &line)
...
@@ -71,7 +70,7 @@ bool TextInputStream::ReadLine(std::string &line)
}
while
(
p
==
nullptr
);
}
while
(
p
==
nullptr
);
size_t
length
=
p
-
src
+
1
;
size_t
length
=
p
-
src
+
1
;
while
(
p
>
src
&&
g_ascii_isspace
(
p
[
-
1
]))
while
(
p
>
src
&&
IsWhitespaceOrNull
(
p
[
-
1
]))
--
p
;
--
p
;
line
=
std
::
string
(
src
,
p
-
src
);
line
=
std
::
string
(
src
,
p
-
src
);
...
...
src/cue/CueParser.cxx
View file @
b39ab761
...
@@ -20,6 +20,7 @@
...
@@ -20,6 +20,7 @@
#include "config.h"
#include "config.h"
#include "CueParser.hxx"
#include "CueParser.hxx"
#include "util/StringUtil.hxx"
#include "util/StringUtil.hxx"
#include "util/CharUtil.hxx"
#include "Song.hxx"
#include "Song.hxx"
#include "tag/Tag.hxx"
#include "tag/Tag.hxx"
...
@@ -54,10 +55,10 @@ static const char *
...
@@ -54,10 +55,10 @@ static const char *
cue_next_word
(
char
*
p
,
char
**
pp
)
cue_next_word
(
char
*
p
,
char
**
pp
)
{
{
assert
(
p
>=
*
pp
);
assert
(
p
>=
*
pp
);
assert
(
!
g_ascii_isspace
(
*
p
));
assert
(
!
IsWhitespaceNotNull
(
*
p
));
const
char
*
word
=
p
;
const
char
*
word
=
p
;
while
(
*
p
!=
0
&&
!
g_ascii_isspace
(
*
p
))
while
(
!
IsWhitespaceOrNull
(
*
p
))
++
p
;
++
p
;
*
p
=
0
;
*
p
=
0
;
...
...
src/input/CurlInputPlugin.cxx
View file @
b39ab761
...
@@ -29,6 +29,7 @@
...
@@ -29,6 +29,7 @@
#include "event/MultiSocketMonitor.hxx"
#include "event/MultiSocketMonitor.hxx"
#include "event/Call.hxx"
#include "event/Call.hxx"
#include "IOThread.hxx"
#include "IOThread.hxx"
#include "util/CharUtil.hxx"
#include "util/Error.hxx"
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "util/Domain.hxx"
#include "Log.hxx"
#include "Log.hxx"
...
@@ -839,10 +840,10 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
...
@@ -839,10 +840,10 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
/* strip the value */
/* strip the value */
while
(
value
<
end
&&
g_ascii_isspace
(
*
value
))
while
(
value
<
end
&&
IsWhitespaceOrNull
(
*
value
))
++
value
;
++
value
;
while
(
end
>
value
&&
g_ascii_isspace
(
end
[
-
1
]))
while
(
end
>
value
&&
IsWhitespaceOrNull
(
end
[
-
1
]))
--
end
;
--
end
;
if
(
g_ascii_strcasecmp
(
name
,
"accept-ranges"
)
==
0
)
{
if
(
g_ascii_strcasecmp
(
name
,
"accept-ranges"
)
==
0
)
{
...
...
src/util/CharUtil.hxx
0 → 100644
View file @
b39ab761
/*
* Copyright (C) 2011-2013 Max Kellermann <max@duempel.org>
*
* 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 CHAR_UTIL_HPP
#define CHAR_UTIL_HPP
constexpr
static
inline
bool
IsASCII
(
const
unsigned
char
ch
)
{
return
ch
<
0x80
;
}
constexpr
static
inline
bool
IsASCII
(
const
char
ch
)
{
return
IsASCII
((
unsigned
char
)
ch
);
}
static
inline
bool
IsWhitespaceOrNull
(
const
char
ch
)
{
return
(
unsigned
char
)
ch
<=
0x20
;
}
static
inline
bool
IsWhitespaceNotNull
(
const
char
ch
)
{
return
ch
>
0
&&
ch
<=
0x20
;
}
constexpr
static
inline
bool
IsPrintableASCII
(
char
ch
)
{
return
(
signed
char
)
ch
>=
0x20
;
}
constexpr
static
inline
bool
IsDigitASCII
(
char
ch
)
{
return
ch
>=
'0'
&&
ch
<=
'9'
;
}
constexpr
static
inline
bool
IsUpperAlphaASCII
(
char
ch
)
{
return
ch
>=
'A'
&&
ch
<=
'Z'
;
}
constexpr
static
inline
bool
IsLowerAlphaASCII
(
char
ch
)
{
return
ch
>=
'a'
&&
ch
<=
'z'
;
}
constexpr
static
inline
bool
IsAlphaASCII
(
char
ch
)
{
return
IsUpperAlphaASCII
(
ch
)
||
IsLowerAlphaASCII
(
ch
);
}
constexpr
static
inline
bool
IsAlphaNumericASCII
(
char
ch
)
{
return
IsAlphaASCII
(
ch
)
||
IsDigitASCII
(
ch
);
}
/**
* Convert the specified ASCII character (0x00..0x7f) to upper case.
* Unlike toupper(), it ignores the system locale.
*/
constexpr
static
inline
char
ToUpperASCII
(
char
ch
)
{
return
ch
>=
'a'
&&
ch
<=
'z'
?
(
ch
-
(
'a'
-
'A'
))
:
ch
;
}
#endif
src/util/StringUtil.cxx
View file @
b39ab761
...
@@ -18,6 +18,7 @@
...
@@ -18,6 +18,7 @@
*/
*/
#include "StringUtil.hxx"
#include "StringUtil.hxx"
#include "CharUtil.hxx"
#include <glib.h>
#include <glib.h>
...
@@ -26,7 +27,7 @@
...
@@ -26,7 +27,7 @@
const
char
*
const
char
*
strchug_fast
(
const
char
*
p
)
strchug_fast
(
const
char
*
p
)
{
{
while
(
*
p
!=
0
&&
g_ascii_isspace
(
*
p
))
while
(
IsWhitespaceNotNull
(
*
p
))
++
p
;
++
p
;
return
p
;
return
p
;
...
...
src/util/Tokenizer.cxx
View file @
b39ab761
...
@@ -19,6 +19,7 @@
...
@@ -19,6 +19,7 @@
#include "config.h"
#include "config.h"
#include "Tokenizer.hxx"
#include "Tokenizer.hxx"
#include "CharUtil.hxx"
#include "StringUtil.hxx"
#include "StringUtil.hxx"
#include "Error.hxx"
#include "Error.hxx"
#include "Domain.hxx"
#include "Domain.hxx"
...
@@ -33,13 +34,13 @@ static constexpr Domain tokenizer_domain("tokenizer");
...
@@ -33,13 +34,13 @@ static constexpr Domain tokenizer_domain("tokenizer");
static
inline
bool
static
inline
bool
valid_word_first_char
(
char
ch
)
valid_word_first_char
(
char
ch
)
{
{
return
g_ascii_isalpha
(
ch
);
return
IsAlphaASCII
(
ch
);
}
}
static
inline
bool
static
inline
bool
valid_word_char
(
char
ch
)
valid_word_char
(
char
ch
)
{
{
return
g_ascii_isalnum
(
ch
)
||
ch
==
'_'
;
return
IsAlphaNumericASCII
(
ch
)
||
ch
==
'_'
;
}
}
char
*
char
*
...
@@ -61,7 +62,7 @@ Tokenizer::NextWord(Error &error)
...
@@ -61,7 +62,7 @@ Tokenizer::NextWord(Error &error)
whitespace or end-of-string */
whitespace or end-of-string */
while
(
*++
input
!=
0
)
{
while
(
*++
input
!=
0
)
{
if
(
g_ascii_isspace
(
*
input
))
{
if
(
IsWhitespaceOrNull
(
*
input
))
{
/* a whitespace: the word ends here */
/* a whitespace: the word ends here */
*
input
=
0
;
*
input
=
0
;
/* skip all following spaces, too */
/* skip all following spaces, too */
...
@@ -106,7 +107,7 @@ Tokenizer::NextUnquoted(Error &error)
...
@@ -106,7 +107,7 @@ Tokenizer::NextUnquoted(Error &error)
whitespace or end-of-string */
whitespace or end-of-string */
while
(
*++
input
!=
0
)
{
while
(
*++
input
!=
0
)
{
if
(
g_ascii_isspace
(
*
input
))
{
if
(
IsWhitespaceOrNull
(
*
input
))
{
/* a whitespace: the word ends here */
/* a whitespace: the word ends here */
*
input
=
0
;
*
input
=
0
;
/* skip all following spaces, too */
/* skip all following spaces, too */
...
@@ -170,7 +171,7 @@ Tokenizer::NextString(Error &error)
...
@@ -170,7 +171,7 @@ Tokenizer::NextString(Error &error)
line) */
line) */
++
input
;
++
input
;
if
(
*
input
!=
0
&&
!
g_ascii_isspace
(
*
input
))
{
if
(
!
IsWhitespaceOrNull
(
*
input
))
{
error
.
Set
(
tokenizer_domain
,
error
.
Set
(
tokenizer_domain
,
"Space expected after closing '
\"
'"
);
"Space expected after closing '
\"
'"
);
return
nullptr
;
return
nullptr
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment