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

db/upnp/Discovery: eliminate two strlen() calls

Browse Source
This commit is contained in:
Max Kellermann 2014-01-22 21:47:34 +01:00
parent 0defd927f3
commit a0bee9fa0a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/db/upnp/Discovery.cxx
View File

@ -30,7 +30,7 @@
#include <string.h> #include <string.h>
// The service type string we are looking for. // The service type string we are looking for.
static const char *const ContentDirectorySType = "urn:schemas-upnp-org:service:ContentDirectory:1"; static constexpr char ContentDirectorySType[] = "urn:schemas-upnp-org:service:ContentDirectory:1";
// We don't include a version in comparisons, as we are satisfied with // We don't include a version in comparisons, as we are satisfied with
// version 1 // version 1
@ -38,18 +38,18 @@ gcc_pure
static bool static bool
isCDService(const char *st) isCDService(const char *st)
{ {
const size_t sz = strlen(ContentDirectorySType) - 2; constexpr size_t sz = sizeof(ContentDirectorySType) - 3;
return memcmp(ContentDirectorySType, st, sz) == 0; return memcmp(ContentDirectorySType, st, sz) == 0;
} }
// The type of device we're asking for in search // The type of device we're asking for in search
static const char *const MediaServerDType = "urn:schemas-upnp-org:device:MediaServer:1"; static constexpr char MediaServerDType[] = "urn:schemas-upnp-org:device:MediaServer:1";
gcc_pure gcc_pure
static bool static bool
isMSDevice(const char *st) isMSDevice(const char *st)
{ {
const size_t sz = strlen(MediaServerDType) - 2; constexpr size_t sz = sizeof(MediaServerDType) - 3;
return memcmp(MediaServerDType, st, sz) == 0; return memcmp(MediaServerDType, st, sz) == 0;
} }