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

system/FileDescriptor: move to io/

This commit is contained in:
Max Kellermann 2020-05-05 14:11:13 +02:00
parent 97f7270aa8
commit 9815d10137
24 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -331,6 +331,7 @@ endif
subdir('src/util') subdir('src/util')
subdir('src/time') subdir('src/time')
subdir('src/io')
subdir('src/system') subdir('src/system')
subdir('src/thread') subdir('src/thread')
subdir('src/net') subdir('src/net')

2
src/db/update/InotifySource.cxx
View File

@ -19,7 +19,7 @@
#include "InotifySource.hxx" #include "InotifySource.hxx"
#include "InotifyDomain.hxx" #include "InotifyDomain.hxx"
#include "system/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "system/FatalError.hxx" #include "system/FatalError.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include "Log.hxx" #include "Log.hxx"

2
src/fs/FileSystem.hxx
View File

@ -21,7 +21,7 @@
#define MPD_FS_FILESYSTEM_HXX #define MPD_FS_FILESYSTEM_HXX
#include "Path.hxx" #include "Path.hxx"
#include "system/UniqueFileDescriptor.hxx" #include "io/UniqueFileDescriptor.hxx"
#ifdef _WIN32 #ifdef _WIN32
#include <fileapi.h> #include <fileapi.h>

2
src/fs/io/FileOutputStream.hxx
View File

@ -35,7 +35,7 @@
#include "util/Compiler.h" #include "util/Compiler.h"
#ifndef _WIN32 #ifndef _WIN32
#include "system/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#endif #endif
#include <cassert> #include <cassert>

2
src/fs/io/FileReader.cxx
View File

@ -30,7 +30,7 @@
#include "FileReader.hxx" #include "FileReader.hxx"
#include "fs/FileInfo.hxx" #include "fs/FileInfo.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include "system/Open.hxx" #include "io/Open.hxx"
#include <cassert> #include <cassert>

2
src/fs/io/FileReader.hxx
View File

@ -37,7 +37,7 @@
#ifdef _WIN32 #ifdef _WIN32
#include <windows.h> #include <windows.h>
#else #else
#include "system/UniqueFileDescriptor.hxx" #include "io/UniqueFileDescriptor.hxx"
#endif #endif
class Path; class Path;

1
src/fs/meson.build
View File

@ -48,6 +48,7 @@ fs = static_library(
fs_dep = declare_dependency( fs_dep = declare_dependency(
link_with: fs, link_with: fs,
dependencies: [ dependencies: [
io_dep,
system_dep, system_dep,
icu_dep, icu_dep,
shlwapi_dep, shlwapi_dep,

2
src/input/plugins/FileInputPlugin.cxx
View File

@ -22,7 +22,7 @@
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "fs/FileInfo.hxx" #include "fs/FileInfo.hxx"
#include "fs/io/FileReader.hxx" #include "fs/io/FileReader.hxx"
#include "system/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include <sys/stat.h> #include <sys/stat.h>

0
src/system/FileDescriptor.cxx → src/io/FileDescriptor.cxx
View File

0
src/system/FileDescriptor.hxx → src/io/FileDescriptor.hxx
View File

2
src/system/Open.cxx → src/io/Open.cxx
View File

@ -28,8 +28,8 @@
*/ */
#include "Open.hxx" #include "Open.hxx"
#include "Error.hxx"
#include "UniqueFileDescriptor.hxx" #include "UniqueFileDescriptor.hxx"
#include "system/Error.hxx"
#include <fcntl.h> #include <fcntl.h>

0
src/system/Open.hxx → src/io/Open.hxx
View File

0
src/system/UniqueFileDescriptor.hxx → src/io/UniqueFileDescriptor.hxx
View File

10
src/io/meson.build Normal file
View File

@ -0,0 +1,10 @@
io = static_library(
'io',
'FileDescriptor.cxx',
'Open.cxx',
include_directories: inc,
)
io_dep = declare_dependency(
link_with: io,
)

2
src/mixer/plugins/OssMixerPlugin.cxx
View File

@ -19,7 +19,7 @@
#include "mixer/MixerInternal.hxx" #include "mixer/MixerInternal.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "system/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

2
src/net/SocketDescriptor.hxx
View File

@ -31,7 +31,7 @@
#define SOCKET_DESCRIPTOR_HXX #define SOCKET_DESCRIPTOR_HXX
#include "Features.hxx" #include "Features.hxx"
#include "system/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include <type_traits> #include <type_traits>

2
src/output/plugins/OssOutputPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "OssOutputPlugin.hxx" #include "OssOutputPlugin.hxx"
#include "../OutputAPI.hxx" #include "../OutputAPI.hxx"
#include "mixer/MixerList.hxx" #include "mixer/MixerList.hxx"
#include "system/UniqueFileDescriptor.hxx" #include "io/UniqueFileDescriptor.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"

2
src/output/plugins/SolarisOutputPlugin.cxx
View File

@ -19,7 +19,7 @@
#include "SolarisOutputPlugin.hxx" #include "SolarisOutputPlugin.hxx"
#include "../OutputAPI.hxx" #include "../OutputAPI.hxx"
#include "system/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include <cerrno> #include <cerrno>

4
src/system/EpollFD.hxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2013-2019 Max Kellermann <max.kellermann@gmail.com> * Copyright 2013-2020 Max Kellermann <max.kellermann@gmail.com>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
@ -30,7 +30,7 @@
#ifndef EPOLL_FD_HXX #ifndef EPOLL_FD_HXX
#define EPOLL_FD_HXX #define EPOLL_FD_HXX
#include "UniqueFileDescriptor.hxx" #include "io/UniqueFileDescriptor.hxx"
#include <cstdint> #include <cstdint>

2
src/system/EventFD.hxx
View File

@ -30,7 +30,7 @@
#ifndef EVENT_FD_HXX #ifndef EVENT_FD_HXX
#define EVENT_FD_HXX #define EVENT_FD_HXX
#include "UniqueFileDescriptor.hxx" #include "io/UniqueFileDescriptor.hxx"
/** /**
* A class that wraps eventfd(). * A class that wraps eventfd().

2
src/system/EventPipe.cxx
View File

@ -18,7 +18,7 @@
*/ */
#include "EventPipe.hxx" #include "EventPipe.hxx"
#include "FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include "util/Compiler.h" #include "util/Compiler.h"

2
src/system/SignalFD.hxx
View File

@ -30,7 +30,7 @@
#ifndef SIGNAL_FD_HXX #ifndef SIGNAL_FD_HXX
#define SIGNAL_FD_HXX #define SIGNAL_FD_HXX
#include "UniqueFileDescriptor.hxx" #include "io/UniqueFileDescriptor.hxx"
#include <csignal> #include <csignal>

3
src/system/meson.build
View File

@ -1,7 +1,5 @@
system_sources = [ system_sources = [
'FatalError.cxx', 'FatalError.cxx',
'FileDescriptor.cxx',
'Open.cxx',
'EventPipe.cxx', 'EventPipe.cxx',
'Clock.cxx', 'Clock.cxx',
] ]
@ -29,6 +27,7 @@ endif
system_dep = declare_dependency( system_dep = declare_dependency(
link_with: system, link_with: system,
dependencies: [ dependencies: [
io_dep,
winsock_dep, winsock_dep,
], ],
) )

2
test/run_filter.cxx
View File

@ -28,7 +28,7 @@
#include "pcm/Volume.hxx" #include "pcm/Volume.hxx"
#include "mixer/MixerControl.hxx" #include "mixer/MixerControl.hxx"
#include "system/Error.hxx" #include "system/Error.hxx"
#include "system/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "util/ConstBuffer.hxx" #include "util/ConstBuffer.hxx"
#include "util/StringBuffer.hxx" #include "util/StringBuffer.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"