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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -285,7 +285,7 @@ libsystem_a_SOURCES = \
src/system/fd_util.c src/system/fd_util.h \
src/system/SocketUtil.cxx src/system/SocketUtil.hxx \
src/system/SocketError.hxx \
src/system/resolver.c src/system/resolver.h \
src/system/Resolver.cxx src/system/Resolver.hxx \
src/system/EventPipe.cxx src/system/EventPipe.hxx \
src/system/EventFD.cxx src/system/EventFD.hxx \
src/system/SignalFD.cxx src/system/SignalFD.hxx \
@ -1072,7 +1072,7 @@ test_read_conf_SOURCES = test/read_conf.cxx
test_run_resolver_LDADD = \
libsystem.a \
$(GLIB_LIBS)
test_run_resolver_SOURCES = test/run_resolver.c
test_run_resolver_SOURCES = test/run_resolver.cxx
test_DumpDatabase_LDADD = \
$(DB_LIBS) \

4
src/ClientNew.cxx
View File

@ -23,9 +23,7 @@
#include "Partition.hxx"
#include "Instance.hxx"
#include "system/fd_util.h"
extern "C" {
#include "system/resolver.h"
}
#include "system/Resolver.hxx"
#include "Permission.hxx"
#include <assert.h>

2
src/event/ServerSocket.cxx
View File

@ -27,7 +27,7 @@
#include "system/SocketUtil.hxx"
#include "system/SocketError.hxx"
#include "event/SocketMonitor.hxx"
#include "system/resolver.h"
#include "system/Resolver.hxx"
#include "system/fd_util.h"
#include <sys/types.h>

2
src/output/HttpdOutputPlugin.cxx
View File

@ -24,7 +24,7 @@
#include "OutputAPI.hxx"
#include "EncoderPlugin.hxx"
#include "EncoderList.hxx"
#include "system/resolver.h"
#include "system/Resolver.hxx"
#include "Page.hxx"
#include "IcyMetaDataServer.hxx"
#include "system/fd_util.h"

14
src/system/resolver.c → src/system/Resolver.cxx
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);

14
src/system/resolver.h → src/system/Resolver.hxx
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

4
test/run_resolver.c → test/run_resolver.cxx
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 "system/resolver.h"
#include "system/Resolver.hxx"
#ifdef WIN32
#include <ws2tcpip.h>