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

socket_util: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-01-15 22:39:51 +01:00
parent 5bb2d64ddb
commit e90d606f0a
4 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -124,7 +124,6 @@ mpd_headers = \
src/TimePrint.cxx src/TimePrint.hxx \ src/TimePrint.cxx src/TimePrint.hxx \
src/song.h \ src/song.h \
src/song_sort.c src/song_sort.h \ src/song_sort.c src/song_sort.h \
src/socket_util.h \
src/stats.h \ src/stats.h \
src/tag.h \ src/tag.h \
src/tag_internal.h \ src/tag_internal.h \
@ -280,7 +279,7 @@ src_mpd_SOURCES = \
src/SongPrint.cxx src/SongPrint.hxx \ src/SongPrint.cxx src/SongPrint.hxx \
src/SongSave.cxx src/SongSave.hxx \ src/SongSave.cxx src/SongSave.hxx \
src/resolver.c src/resolver.h \ src/resolver.c src/resolver.h \
src/socket_util.c \ src/SocketUtil.cxx src/SocketUtil.hxx \
src/StateFile.cxx src/StateFile.hxx \ src/StateFile.cxx src/StateFile.hxx \
src/Stats.cxx \ src/Stats.cxx \
src/Tag.cxx \ src/Tag.cxx \
@ -1288,7 +1287,7 @@ test_run_output_SOURCES = test/run_output.cxx \
src/timer.c src/clock.c \ src/timer.c src/clock.c \
src/Tag.cxx src/TagNames.c src/TagPool.cxx \ src/Tag.cxx src/TagNames.c src/TagPool.cxx \
src/page.c \ src/page.c \
src/socket_util.c \ src/SocketUtil.cxx \
src/resolver.c \ src/resolver.c \
src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \ src/OutputInit.cxx src/OutputFinish.cxx src/OutputList.cxx \
src/OutputPlugin.cxx \ src/OutputPlugin.cxx \

2
src/ServerSocket.cxx
View File

@ -24,7 +24,7 @@
#endif #endif
#include "ServerSocket.hxx" #include "ServerSocket.hxx"
#include "socket_util.h" #include "SocketUtil.hxx"
#include "resolver.h" #include "resolver.h"
#include "fd_util.h" #include "fd_util.h"
#include "glib_socket.h" #include "glib_socket.h"

4
src/socket_util.c → src/SocketUtil.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 * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -18,7 +18,7 @@
*/ */
#include "config.h" #include "config.h"
#include "socket_util.h" #include "SocketUtil.hxx"
#include "fd_util.h" #include "fd_util.h"
#include <glib.h> #include <glib.h>

14
src/socket_util.h → src/SocketUtil.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 * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -23,8 +23,8 @@
* *
*/ */
#ifndef SOCKET_UTIL_H #ifndef MPD_SOCKET_UTIL_HXX
#define SOCKET_UTIL_H #define MPD_SOCKET_UTIL_HXX
#include "gerror.h" #include "gerror.h"
@ -32,10 +32,6 @@
struct sockaddr; struct sockaddr;
#ifdef __cplusplus
extern "C" {
#endif
/** /**
* Creates a socket listening on the specified address. This is a * Creates a socket listening on the specified address. This is a
* shortcut for socket(), bind() and listen(). * shortcut for socket(), bind() and listen().
@ -59,8 +55,4 @@ socket_bind_listen(int domain, int type, int protocol,
int int
socket_keepalive(int fd); socket_keepalive(int fd);
#ifdef __cplusplus
}
#endif
#endif #endif