diff options
| author | Max Kellermann <max@duempel.org> | 2013-04-09 01:08:20 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-04-09 01:08:20 +0200 |
| commit | 0921180b9020c2a83d0c1e6636d32278770de5d9 (patch) | |
| tree | fa342d4c90a090bbfdc9ee3b733bce7f5d200ddd /src/util | |
| parent | 14df240f5b16822da0901b35f7d0cb053c895129 (diff) | |
| download | mpd-0921180b9020c2a83d0c1e6636d32278770de5d9.tar.gz mpd-0921180b9020c2a83d0c1e6636d32278770de5d9.tar.xz mpd-0921180b9020c2a83d0c1e6636d32278770de5d9.zip | |
string_util: convert to C++
Diffstat (limited to '')
| -rw-r--r-- | src/util/StringUtil.cxx (renamed from src/string_util.c) | 10 | ||||
| -rw-r--r-- | src/util/StringUtil.hxx (renamed from src/string_util.h) | 17 | ||||
| -rw-r--r-- | src/util/Tokenizer.cxx | 2 |
3 files changed, 10 insertions, 19 deletions
diff --git a/src/string_util.c b/src/util/StringUtil.cxx index 00c36892b..87d032735 100644 --- a/src/string_util.c +++ b/src/util/StringUtil.cxx @@ -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; diff --git a/src/string_util.h b/src/util/StringUtil.hxx index 5b76c980b..72d613798 100644 --- a/src/string_util.h +++ b/src/util/StringUtil.hxx @@ -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 diff --git a/src/util/Tokenizer.cxx b/src/util/Tokenizer.cxx index 9ade0d1b1..2d6c2b434 100644 --- a/src/util/Tokenizer.cxx +++ b/src/util/Tokenizer.cxx @@ -19,7 +19,7 @@ #include "config.h" #include "Tokenizer.hxx" -#include "string_util.h" +#include "StringUtil.hxx" #include <glib.h> |