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

system/FmtError: move to lib/fmt/

Browse Source
This commit is contained in:
Max Kellermann 2022-11-28 23:05:15 +01:00
parent 7d8c076e06
commit 66029c405f
23 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/LogInit.cxx
View File

@ -30,7 +30,7 @@
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/StringAPI.hxx" #include "util/StringAPI.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include <cassert> #include <cassert>

2
src/archive/plugins/ZzipArchivePlugin.cxx
View File

@ -27,7 +27,7 @@
#include "../ArchiveVisitor.hxx" #include "../ArchiveVisitor.hxx"
#include "input/InputStream.hxx" #include "input/InputStream.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "util/UTF8.hxx" #include "util/UTF8.hxx"

1
src/archive/plugins/meson.build
View File

@ -31,6 +31,7 @@ archive_plugins = static_library(
archive_plugins_sources, archive_plugins_sources,
include_directories: inc, include_directories: inc,
dependencies: [ dependencies: [
fmt_dep,
libbz2_dep, libbz2_dep,
libiso9660_dep, libiso9660_dep,
libzzip_dep, libzzip_dep,

2
src/db/plugins/simple/SimpleDatabasePlugin.cxx
View File

@ -40,7 +40,7 @@
#include "fs/FileInfo.hxx" #include "fs/FileInfo.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "fs/FileSystem.hxx" #include "fs/FileSystem.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "util/CharUtil.hxx" #include "util/CharUtil.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/RecursiveMap.hxx" #include "util/RecursiveMap.hxx"

2
src/event/InotifyEvent.cxx
View File

@ -31,7 +31,7 @@
*/ */
#include "InotifyEvent.hxx" #include "InotifyEvent.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "io/UniqueFileDescriptor.hxx" #include "io/UniqueFileDescriptor.hxx"
#include <array> #include <array>

2
src/fs/DirectoryReader.cxx
View File

@ -19,7 +19,7 @@
#include "DirectoryReader.hxx" #include "DirectoryReader.hxx"
#include "lib/fmt/PathFormatter.hxx" #include "lib/fmt/PathFormatter.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#ifdef _WIN32 #ifdef _WIN32

2
src/fs/FileInfo.hxx
View File

@ -22,7 +22,7 @@
#include "Path.hxx" #include "Path.hxx"
#include "lib/fmt/PathFormatter.hxx" #include "lib/fmt/PathFormatter.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#ifdef _WIN32 #ifdef _WIN32
#include "time/FileTime.hxx" #include "time/FileTime.hxx"

2
src/fs/FileSystem.cxx
View File

@ -21,7 +21,7 @@
#include "AllocatedPath.hxx" #include "AllocatedPath.hxx"
#include "Limits.hxx" #include "Limits.hxx"
#include "lib/fmt/PathFormatter.hxx" #include "lib/fmt/PathFormatter.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#ifdef _WIN32 #ifdef _WIN32
#include <handleapi.h> // for CloseHandle() #include <handleapi.h> // for CloseHandle()

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

@ -21,7 +21,7 @@
#include "../AsyncInputStream.hxx" #include "../AsyncInputStream.hxx"
#include "event/Call.hxx" #include "event/Call.hxx"
#include "event/Loop.hxx" #include "event/Loop.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "io/Open.hxx" #include "io/Open.hxx"
#include "io/UniqueFileDescriptor.hxx" #include "io/UniqueFileDescriptor.hxx"
#include "io/uring/ReadOperation.hxx" #include "io/uring/ReadOperation.hxx"

2
src/io/FileOutputStream.cxx
View File

@ -29,7 +29,7 @@
#include "FileOutputStream.hxx" #include "FileOutputStream.hxx"
#include "lib/fmt/PathFormatter.hxx" #include "lib/fmt/PathFormatter.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "util/StringFormat.hxx" #include "util/StringFormat.hxx"
#ifdef _WIN32 #ifdef _WIN32

2
src/io/FileReader.cxx
View File

@ -30,7 +30,7 @@
#include "FileReader.hxx" #include "FileReader.hxx"
#include "lib/fmt/PathFormatter.hxx" #include "lib/fmt/PathFormatter.hxx"
#include "fs/FileInfo.hxx" #include "fs/FileInfo.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "io/Open.hxx" #include "io/Open.hxx"
#include <cassert> #include <cassert>

2
src/io/Open.cxx
View File

@ -29,7 +29,7 @@
#include "Open.hxx" #include "Open.hxx"
#include "UniqueFileDescriptor.hxx" #include "UniqueFileDescriptor.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include <fcntl.h> #include <fcntl.h>

4
src/system/FmtError.cxx → src/lib/fmt/SystemError.cxx
View File

@ -27,8 +27,8 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "FmtError.hxx" #include "SystemError.hxx"
#include "lib/fmt/ToBuffer.hxx" #include "ToBuffer.hxx"
#include <array> #include <array>

2
src/system/FmtError.hxx → src/lib/fmt/SystemError.hxx
View File

@ -29,7 +29,7 @@
#pragma once #pragma once
#include "Error.hxx" // IWYU pragma: export #include "system/Error.hxx" // IWYU pragma: export
#include <fmt/core.h> #include <fmt/core.h>
#if FMT_VERSION >= 80000 && FMT_VERSION < 90000 #if FMT_VERSION >= 80000 && FMT_VERSION < 90000

10
src/lib/fmt/meson.build
View File

@ -8,6 +8,14 @@ if compiler.get_id() == 'clang' and compiler.version().version_compare('<15')
) )
endif endif
fmt_dep = declare_dependency( fmt = static_library(
'fmt',
'SystemError.cxx',
include_directories: inc,
dependencies: libfmt,
)
fmt_dep = declare_dependency(
link_with: fmt,
dependencies: libfmt, dependencies: libfmt,
) )

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

@ -21,7 +21,7 @@
#include "mixer/Mixer.hxx" #include "mixer/Mixer.hxx"
#include "config/Block.hxx" #include "config/Block.hxx"
#include "io/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "util/ASCII.hxx" #include "util/ASCII.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"

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

@ -24,7 +24,7 @@
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "fs/FileSystem.hxx" #include "fs/FileSystem.hxx"
#include "fs/FileInfo.hxx" #include "fs/FileInfo.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"
#include "Log.hxx" #include "Log.hxx"

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

@ -22,7 +22,7 @@
#include "mixer/plugins/OssMixerPlugin.hxx" #include "mixer/plugins/OssMixerPlugin.hxx"
#include "pcm/Export.hxx" #include "pcm/Export.hxx"
#include "io/UniqueFileDescriptor.hxx" #include "io/UniqueFileDescriptor.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "util/Domain.hxx" #include "util/Domain.hxx"
#include "util/ByteOrder.hxx" #include "util/ByteOrder.hxx"
#include "util/Manual.hxx" #include "util/Manual.hxx"

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

@ -19,7 +19,7 @@
#include "PipeOutputPlugin.hxx" #include "PipeOutputPlugin.hxx"
#include "../OutputAPI.hxx" #include "../OutputAPI.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>

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

@ -20,7 +20,7 @@
#include "SolarisOutputPlugin.hxx" #include "SolarisOutputPlugin.hxx"
#include "../OutputAPI.hxx" #include "../OutputAPI.hxx"
#include "io/FileDescriptor.hxx" #include "io/FileDescriptor.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include <cerrno> #include <cerrno>

1
src/system/meson.build
View File

@ -1,6 +1,5 @@
system_sources = [ system_sources = [
'EventPipe.cxx', 'EventPipe.cxx',
'FmtError.cxx',
] ]
if host_machine.system() == 'linux' if host_machine.system() == 'linux'

2
src/unix/Daemon.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "Daemon.hxx" #include "Daemon.hxx"
#include "lib/fmt/PathFormatter.hxx" #include "lib/fmt/PathFormatter.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "util/RuntimeError.hxx" #include "util/RuntimeError.hxx"

2
src/unix/PidFile.hxx
View File

@ -23,7 +23,7 @@
#include "lib/fmt/PathFormatter.hxx" #include "lib/fmt/PathFormatter.hxx"
#include "fs/FileSystem.hxx" #include "fs/FileSystem.hxx"
#include "fs/AllocatedPath.hxx" #include "fs/AllocatedPath.hxx"
#include "system/FmtError.hxx" #include "lib/fmt/SystemError.hxx"
#include <cassert> #include <cassert>