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

Util/StringUtil: add StringStartsWith()

Browse Source 
Replaces GLib's g_str_has_prefix().
This commit is contained in:
Max Kellermann
2013-11-28 18:48:35 +01:00
parent a788b7e747
commit af4133e3c9
16 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/QueueSave.cxx
View File

@@ -26,13 +26,12 @@
#include "DatabasePlugin.hxx"
#include "DatabaseGlue.hxx"
#include "TextFile.hxx"
#include "util/StringUtil.hxx"
#include "util/UriUtil.hxx"
#include "util/Error.hxx"
#include "fs/Traits.hxx"
#include "Log.hxx"
#include <glib.h>
#include <stdlib.h>
#define PRIO_LABEL "Prio: "
@@ -78,7 +77,7 @@ queue_load_song(TextFile &file, const char *line, queue &queue)
return;
uint8_t priority = 0;
if (g_str_has_prefix(line, PRIO_LABEL)) {
if (StringStartsWith(line, PRIO_LABEL)) {
priority = strtoul(line + sizeof(PRIO_LABEL) - 1, nullptr, 10);
line = file.ReadLine();
@@ -89,7 +88,7 @@ queue_load_song(TextFile &file, const char *line, queue &queue)
const Database *db = nullptr;
Song *song;
if (g_str_has_prefix(line, SONG_BEGIN)) {
if (StringStartsWith(line, SONG_BEGIN)) {
const char *uri = line + sizeof(SONG_BEGIN) - 1;
if (!uri_has_scheme(uri) && !PathTraits::IsAbsoluteUTF8(uri))
return;