diff options
| author | Max Kellermann <max@duempel.org> | 2013-09-04 18:02:09 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-09-04 18:02:09 +0200 |
| commit | c9fcc7f14860777458153eb2d13c773ccfa1daa2 (patch) | |
| tree | cc98c85cb6db89cf2a6a3a116b8c4bccc40e1ada /src/system | |
| parent | d1f4a31b5ed5cef6ed57242f3343925e63efd9f9 (diff) | |
| download | mpd-c9fcc7f14860777458153eb2d13c773ccfa1daa2.tar.gz mpd-c9fcc7f14860777458153eb2d13c773ccfa1daa2.tar.xz mpd-c9fcc7f14860777458153eb2d13c773ccfa1daa2.zip | |
system/resolver: convert to C++
Diffstat (limited to 'src/system')
| -rw-r--r-- | src/system/Resolver.cxx (renamed from src/system/resolver.c) | 14 | ||||
| -rw-r--r-- | src/system/Resolver.hxx (renamed from src/system/resolver.h) | 14 |
2 files changed, 10 insertions, 18 deletions
diff --git a/src/system/resolver.c b/src/system/Resolver.cxx index 243b7cd02..a574e82c1 100644 --- a/src/system/resolver.c +++ b/src/system/Resolver.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 @@ -18,7 +18,7 @@ */ #include "config.h" -#include "resolver.h" +#include "Resolver.hxx" #ifndef G_OS_WIN32 #include <sys/socket.h> @@ -120,11 +120,11 @@ resolve_host_port(const char *host_port, unsigned default_port, if ((flags & AI_PASSIVE) != 0 && strcmp(host, "*") == 0) host = NULL; - const struct addrinfo hints = { - .ai_flags = flags, - .ai_family = AF_UNSPEC, - .ai_socktype = socktype, - }; + addrinfo hints; + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = flags; + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = socktype; struct addrinfo *ai; int ret = getaddrinfo(host, port, &hints, &ai); diff --git a/src/system/resolver.h b/src/system/Resolver.hxx index af14f5f23..a1cd00329 100644 --- a/src/system/resolver.h +++ b/src/system/Resolver.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,8 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef MPD_RESOLVER_H -#define MPD_RESOLVER_H +#ifndef MPD_RESOLVER_HXX +#define MPD_RESOLVER_HXX #include "gcc.h" @@ -34,10 +34,6 @@ resolver_quark(void) return g_quark_from_static_string("resolver"); } -#ifdef __cplusplus -extern "C" { -#endif - /** * Converts the specified socket address into a string in the form * "IP:PORT". The return value must be freed with g_free() when you @@ -67,8 +63,4 @@ resolve_host_port(const char *host_port, unsigned default_port, int flags, int socktype, GError **error_r); -#ifdef __cplusplus -} -#endif - #endif |