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

string_util: convert to C++

Browse Source
This commit is contained in:
Max Kellermann
2013-04-09 01:08:20 +02:00
parent 14df240f5b
commit 0921180b90
13 changed files with 33 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile.am
View File

@@ -99,7 +99,6 @@ mpd_headers = \
src/tag_id3.h \
src/tag_rva2.h \
src/utils.h \
src/string_util.h \
src/timer.h \
src/mpd_error.h
@@ -244,7 +243,6 @@ src_mpd_SOURCES = \
src/TextFile.cxx src/TextFile.hxx \
src/text_input_stream.c \
src/utils.c \
src/string_util.c \
src/Volume.cxx src/Volume.hxx \
src/SongFilter.cxx src/SongFilter.hxx \
src/SongPointer.hxx \
@@ -288,6 +286,7 @@ endif
# Generic utility library
libutil_a_SOURCES = \
src/util/StringUtil.cxx src/util/StringUtil.hxx \
src/util/Tokenizer.cxx src/util/Tokenizer.hxx \
src/util/UriUtil.cxx src/util/UriUtil.hxx \
src/util/Manual.hxx \
@@ -1058,7 +1057,7 @@ test_read_conf_LDADD = \
libfs.a \
$(GLIB_LIBS)
test_read_conf_SOURCES = test/read_conf.cxx \
src/utils.c src/string_util.c
src/utils.c
test_run_resolver_LDADD = \
$(GLIB_LIBS)
@@ -1081,7 +1080,7 @@ test_DumpDatabase_SOURCES = test/DumpDatabase.cxx \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
src/SongFilter.cxx \
src/TextFile.cxx \
src/utils.c src/string_util.c
src/utils.c
test_run_input_LDADD = \
$(INPUT_LIBS) \
@@ -1094,7 +1093,7 @@ test_run_input_LDADD = \
test_run_input_SOURCES = test/run_input.cxx \
test/stdbin.h \
src/IOThread.cxx \
src/utils.c src/string_util.c\
src/utils.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
src/fd_util.c
@@ -1111,7 +1110,7 @@ test_visit_archive_LDADD = \
test_visit_archive_SOURCES = test/visit_archive.cxx \
src/IOThread.cxx \
src/InputStream.cxx \
src/utils.c src/string_util.c \
src/utils.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx \
src/fd_util.c
@@ -1132,7 +1131,7 @@ test_dump_text_file_LDADD = \
test_dump_text_file_SOURCES = test/dump_text_file.cxx \
test/stdbin.h \
src/IOThread.cxx \
src/utils.c src/string_util.c\
src/utils.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx \
src/text_input_stream.c \
src/fd_util.c
@@ -1152,7 +1151,7 @@ test_dump_playlist_LDADD = \
test_dump_playlist_SOURCES = test/dump_playlist.cxx \
$(DECODER_SRC) \
src/IOThread.cxx \
src/utils.c src/string_util.c\
src/utils.c \
src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
src/tag_handler.c src/TagFile.cxx \
src/audio_check.c src/pcm_buffer.c \
@@ -1180,7 +1179,7 @@ test_run_decoder_LDADD = \
test_run_decoder_SOURCES = test/run_decoder.cxx \
test/stdbin.h \
src/IOThread.cxx \
src/utils.c src/string_util.c \
src/utils.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \
src/ReplayGainInfo.cxx \
src/fd_util.c \
@@ -1204,7 +1203,7 @@ test_read_tags_LDADD = \
$(GLIB_LIBS)
test_read_tags_SOURCES = test/read_tags.cxx \
src/IOThread.cxx \
src/utils.c src/string_util.c \
src/utils.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \
src/ReplayGainInfo.cxx \
src/fd_util.c \
@@ -1232,7 +1231,7 @@ test_run_filter_SOURCES = test/run_filter.cxx \
test/FakeReplayGainConfig.cxx \
test/stdbin.h \
src/FilterPlugin.cxx src/FilterRegistry.cxx \
src/utils.c src/string_util.c \
src/utils.c \
src/audio_check.c \
src/audio_format.c \
src/AudioParser.cxx \
@@ -1251,7 +1250,7 @@ if ENABLE_ENCODER
noinst_PROGRAMS += test/run_encoder
test_run_encoder_SOURCES = test/run_encoder.cxx \
test/stdbin.h \
src/utils.c src/string_util.c \
src/utils.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx \
src/audio_check.c \
src/audio_format.c \
@@ -1270,7 +1269,7 @@ if ENABLE_VORBIS_ENCODER
noinst_PROGRAMS += test/test_vorbis_encoder
test_test_vorbis_encoder_SOURCES = test/test_vorbis_encoder.cxx \
test/stdbin.h \
src/utils.c src/string_util.c \
src/utils.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx \
src/audio_check.c \
src/audio_format.c \
@@ -1326,7 +1325,7 @@ test_run_output_LDADD = $(MPD_LIBS) \
test_run_output_SOURCES = test/run_output.cxx \
test/FakeReplayGainConfig.cxx \
test/stdbin.h \
src/utils.c src/string_util.c \
src/utils.c \
src/IOThread.cxx \
src/audio_check.c \
src/audio_format.c \
@@ -1357,7 +1356,7 @@ test_read_mixer_LDADD = \
libfs.a \
$(GLIB_LIBS)
test_read_mixer_SOURCES = test/read_mixer.cxx \
src/utils.c src/string_util.c \
src/utils.c \
src/MixerControl.cxx \
src/MixerInternal.cxx \
src/FilterPlugin.cxx \

2
src/ArchiveList.cxx
View File

@@ -20,7 +20,7 @@
#include "config.h"
#include "ArchiveList.hxx"
#include "ArchivePlugin.hxx"
#include "string_util.h"
#include "util/StringUtil.hxx"
#include "archive/Bzip2ArchivePlugin.hxx"
#include "archive/Iso9660ArchivePlugin.hxx"
#include "archive/ZzipArchivePlugin.hxx"

6
src/ConfigFile.cxx
View File

@@ -24,11 +24,7 @@
#include "ConfigTemplates.hxx"
#include "conf.h"
#include "util/Tokenizer.hxx"
extern "C" {
#include "string_util.h"
}
#include "util/StringUtil.hxx"
#include "fs/Path.hxx"
#include "fs/FileSystem.hxx"

5
src/ConfigParser.cxx
View File

@@ -18,10 +18,7 @@
*/
#include "ConfigParser.hxx"
extern "C" {
#include "string_util.h"
}
#include "util/StringUtil.hxx"
bool
get_bool(const char *value, bool *value_r)

2
src/DecoderPlugin.cxx
View File

@@ -19,7 +19,7 @@
#include "config.h"
#include "decoder_plugin.h"
#include "string_util.h"
#include "util/StringUtil.hxx"
#include <assert.h>

5
src/PlaylistDatabase.cxx
View File

@@ -21,10 +21,7 @@
#include "PlaylistDatabase.hxx"
#include "PlaylistVector.hxx"
#include "TextFile.hxx"
extern "C" {
#include "string_util.h"
}
#include "util/StringUtil.hxx"
#include <string.h>
#include <stdlib.h>

3
src/PlaylistRegistry.cxx
View File

@@ -33,8 +33,7 @@
#include "playlist/EmbeddedCuePlaylistPlugin.hxx"
#include "input_stream.h"
#include "util/UriUtil.hxx"
#include "string_util.h"
#include "util/StringUtil.hxx"
#include "conf.h"
#include "mpd_error.h"

5
src/SongSave.cxx
View File

@@ -24,10 +24,7 @@
#include "Directory.hxx"
#include "TextFile.hxx"
#include "tag.h"
extern "C" {
#include "string_util.h"
}
#include "util/StringUtil.hxx"
#include <glib.h>

2
src/cue/CueParser.cxx
View File

@@ -19,7 +19,7 @@
#include "config.h"
#include "CueParser.hxx"
#include "string_util.h"
#include "util/StringUtil.hxx"
#include "song.h"
#include "tag.h"

2
src/playlist/ExtM3uPlaylistPlugin.cxx
View File

@@ -22,7 +22,7 @@
#include "PlaylistPlugin.hxx"
#include "song.h"
#include "tag.h"
#include "string_util.h"
#include "util/StringUtil.hxx"
extern "C" {
#include "text_input_stream.h"

10
src/string_util.c → src/util/StringUtil.cxx
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "string_util.h"
#include "StringUtil.hxx"
#include <glib.h>
@@ -35,10 +35,10 @@ strchug_fast_c(const char *p)
bool
string_array_contains(const char *const* haystack, const char *needle)
{
assert(haystack != NULL);
assert(needle != NULL);
assert(haystack != nullptr);
assert(needle != nullptr);
for (; *haystack != NULL; ++haystack)
for (; *haystack != nullptr; ++haystack)
if (g_ascii_strcasecmp(*haystack, needle) == 0)
return true;

17
src/string_util.h → src/util/StringUtil.hxx
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2003-2011 The Music Player Daemon Project
* Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -17,17 +17,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_STRING_UTIL_H
#define MPD_STRING_UTIL_H
#ifndef MPD_STRING_UTIL_HXX
#define MPD_STRING_UTIL_HXX
#include "gcc.h"
#include <stdbool.h>
#ifdef __cplusplus
extern "C" {
#endif
/**
* Remove the "const" attribute from a string pointer. This is a
* dirty hack, don't use it unless you know what you're doing!
@@ -79,11 +73,8 @@ strchug_fast(char *p)
* case-insensitive for ASCII characters
* @return true if found
*/
gcc_pure
bool
string_array_contains(const char *const* haystack, const char *needle);
#ifdef __cplusplus
} /* extern "C" */
#endif
#endif

2
src/util/Tokenizer.cxx
View File

@@ -19,7 +19,7 @@
#include "config.h"
#include "Tokenizer.hxx"
#include "string_util.h"
#include "StringUtil.hxx"
#include <glib.h>