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

zeroconf/glue: use strstr() and std::string::replace() instead of std::regex_replace() 

std::regex_replace() is heavily bloated and overkill for this feature.
This commit is contained in:
Max Kellermann 2018-10-31 19:23:57 +01:00
parent b1d68fe995
commit 657ef48518
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/zeroconf/ZeroconfGlue.cxx
View File

@ -27,9 +27,10 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "Log.hxx" #include "Log.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"
#include <string.h>
#include <unistd.h> #include <unistd.h>
#include <limits.h> #include <limits.h>
#include <regex>
static constexpr Domain zeroconf_domain("zeroconf"); static constexpr Domain zeroconf_domain("zeroconf");
@ -62,10 +63,17 @@ ZeroconfInit(const ConfigData &config, gcc_unused EventLoop &loop)
serviceName = config.GetString(ConfigOption::ZEROCONF_NAME, serviceName = config.GetString(ConfigOption::ZEROCONF_NAME,
SERVICE_NAME); SERVICE_NAME);
char hostname[HOST_NAME_MAX+1]; /* replace "%h" with the host name */
gethostname(hostname, HOST_NAME_MAX); const char *h = strstr(serviceName, "%h");
std::string sName = std::regex_replace(serviceName, std::regex("%h"), hostname); std::string buffer;
serviceName = sName.c_str(); if (h != nullptr) {
char hostname[HOST_NAME_MAX+1];
if (gethostname(hostname, HOST_NAME_MAX) == 0) {
buffer = serviceName;
buffer.replace(h - serviceName, 2, hostname);
serviceName = buffer.c_str();
}
}
#ifdef HAVE_AVAHI #ifdef HAVE_AVAHI
AvahiInit(loop, serviceName); AvahiInit(loop, serviceName);