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

Permission: use std::find instead of g_strsplit()

Browse Source
This commit is contained in:
Max Kellermann 2013-10-19 16:43:35 +02:00
parent daa47546c7
commit 9acc1e1e97
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Permission.cxx
View File

@ -24,16 +24,15 @@
#include "ConfigOption.hxx" #include "ConfigOption.hxx"
#include "system/FatalError.hxx" #include "system/FatalError.hxx"
#include <algorithm>
#include <map> #include <map>
#include <string> #include <string>
#include <glib.h>
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
static constexpr char PERMISSION_PASSWORD_CHAR = '@'; static constexpr char PERMISSION_PASSWORD_CHAR = '@';
#define PERMISSION_SEPERATOR "," static constexpr char PERMISSION_SEPARATOR = ',';
static constexpr struct { static constexpr struct {
const char *name; const char *name;
@ -65,17 +64,23 @@ static unsigned parsePermissions(const char *string)
{ {
assert(string != nullptr); assert(string != nullptr);
const char *const end = string + strlen(string);
unsigned permission = 0; unsigned permission = 0;
gchar **tokens; while (true) {
const char *comma = std::find(string, end,
PERMISSION_SEPARATOR);
if (comma > string) {
const std::string name(string, comma);
permission |= ParsePermission(name.c_str());
}
tokens = g_strsplit(string, PERMISSION_SEPERATOR, 0); if (comma == end)
for (unsigned i = 0; tokens[i] != NULL; ++i) { break;
char *temp = tokens[i];
permission |= ParsePermission(temp); string = comma + 1;
} }
g_strfreev(tokens);
return permission; return permission;
} }