system/resolver: convert to C++

This commit is contained in:
Max Kellermann
2013-09-04 18:02:09 +02:00
parent d1f4a31b5e
commit c9fcc7f148
7 changed files with 17 additions and 27 deletions

View File

@@ -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);

View File

@@ -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