summaryrefslogtreecommitdiff
path: root/Userland/mount.cpp
diff options
context:
space:
mode:
authorAndreas Kling <kling@serenityos.org>2020-02-02 12:34:39 +0100
committerAndreas Kling <kling@serenityos.org>2020-02-02 15:15:30 +0100
commit2d39da5405a4527e91e853ddb1e56a539c96c6c1 (patch)
tree342f5d553c844f05b550510de27d5b7c937daf90 /Userland/mount.cpp
parentb7e3810b5c3d7e52217e70eed61132d9f670648d (diff)
downloadserenity-2d39da5405a4527e91e853ddb1e56a539c96c6c1.zip
LibCore: Put all classes in the Core namespace and remove the leading C
I've been wanting to do this for a long time. It's time we start being consistent about how this stuff works. The new convention is: - "LibFoo" is a userspace library that provides the "Foo" namespace. That's it :^) This was pretty tedious to convert and I didn't even start on LibGUI yet. But it's coming up next.
Diffstat (limited to 'Userland/mount.cpp')
-rw-r--r--Userland/mount.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Userland/mount.cpp b/Userland/mount.cpp
index 4260946d87..fb90ed4ff2 100644
--- a/Userland/mount.cpp
+++ b/Userland/mount.cpp
@@ -58,8 +58,8 @@ bool mount_all()
// Mount all filesystems listed in /etc/fstab.
dbg() << "Mounting all filesystems...";
- auto fstab = CFile::construct("/etc/fstab");
- if (!fstab->open(CIODevice::OpenMode::ReadOnly)) {
+ auto fstab = Core::File::construct("/etc/fstab");
+ if (!fstab->open(Core::IODevice::OpenMode::ReadOnly)) {
fprintf(stderr, "Failed to open /etc/fstab: %s\n", fstab->error_string());
return false;
}
@@ -111,8 +111,8 @@ bool mount_all()
bool print_mounts()
{
// Output info about currently mounted filesystems.
- auto df = CFile::construct("/proc/df");
- if (!df->open(CIODevice::ReadOnly)) {
+ auto df = Core::File::construct("/proc/df");
+ if (!df->open(Core::IODevice::ReadOnly)) {
fprintf(stderr, "Failed to open /proc/df: %s\n", df->error_string());
return false;
}
@@ -158,9 +158,9 @@ int main(int argc, char** argv)
const char* options = nullptr;
bool should_mount_all = false;
- CArgsParser args_parser;
- args_parser.add_positional_argument(source, "Source path", "source", CArgsParser::Required::No);
- args_parser.add_positional_argument(mountpoint, "Mount point", "mountpoint", CArgsParser::Required::No);
+ Core::ArgsParser args_parser;
+ args_parser.add_positional_argument(source, "Source path", "source", Core::ArgsParser::Required::No);
+ args_parser.add_positional_argument(mountpoint, "Mount point", "mountpoint", Core::ArgsParser::Required::No);
args_parser.add_option(fs_type, "File system type", nullptr, 't', "fstype");
args_parser.add_option(options, "Mount options", nullptr, 'o', "options");
args_parser.add_option(should_mount_all, "Mount all file systems listed in /etc/fstab", nullptr, 'a');