From af435dd1c9460acc910170b4f82f44bfd3f557c9 Mon Sep 17 00:00:00 2001 From: X512 Date: Thu, 10 Dec 2020 02:21:27 +0900 Subject: [PATCH] libroot: remove delete_driver_settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It is not present in BeOS R5 and it just call unload_driver_settings. Replace delete_driver_settings usages with unload_driver_settings. Keep the symbol on x86 for binary compatibility. Change-Id: I1382710e3a4cb5c65d1249ea0e5880891e6800e4 Reviewed-on: https://review.haiku-os.org/c/haiku/+/3485 Reviewed-by: Jérôme Duval --- headers/build/os/drivers/driver_settings.h | 1 - headers/os/drivers/driver_settings.h | 1 - headers/private/fs_shell/fssh_api_wrapper.h | 1 - headers/private/fs_shell/fssh_driver_settings.h | 1 - .../disk_systems/intel/ExtendedPartitionAddOn.cpp | 4 ++-- .../disk_systems/intel/PartitionMapAddOn.cpp | 10 +++++----- .../kernel/file_systems/bfs/bfs_disk_system.cpp | 2 +- .../file_systems/btrfs/btrfs_disk_system.cpp | 2 +- src/add-ons/kernel/file_systems/fat/mkdos.cpp | 2 +- .../partitioning_systems/intel/write_support.cpp | 8 ++++---- src/apps/drivesetup/InitParametersPanel.cpp | 2 +- src/apps/drivesetup/PartitionList.cpp | 2 +- src/servers/launch/SettingsParser.cpp | 2 +- src/system/libroot/os/driver_settings.cpp | 14 +++++++++----- src/system/libroot/stubbed/libroot_stubs.c | 1 - src/system/libroot/stubbed/libroot_stubs_legacy.c | 1 - .../shared/DriverSettingsMessageAdapterTest.cpp | 2 +- src/tests/system/libroot/os/DriverSettingsTest.cpp | 6 +++--- src/tools/fs_shell/driver_settings.cpp | 7 ------- 19 files changed, 30 insertions(+), 39 deletions(-) diff --git a/headers/build/os/drivers/driver_settings.h b/headers/build/os/drivers/driver_settings.h index 69e8ea1deb..bda8a6d9c9 100644 --- a/headers/build/os/drivers/driver_settings.h +++ b/headers/build/os/drivers/driver_settings.h @@ -29,7 +29,6 @@ extern status_t unload_driver_settings(void *handle); extern void *parse_driver_settings_string(const char *settingsString); extern status_t get_driver_settings_string(void *_handle, char *buffer, size_t *_bufferSize, bool flat); -extern status_t delete_driver_settings(void *handle); extern const char *get_driver_parameter(void *handle, const char *key, const char *unknownValue, /* key not present */ diff --git a/headers/os/drivers/driver_settings.h b/headers/os/drivers/driver_settings.h index 219d18fee9..6314e7492a 100644 --- a/headers/os/drivers/driver_settings.h +++ b/headers/os/drivers/driver_settings.h @@ -30,7 +30,6 @@ extern status_t unload_driver_settings(void *handle); extern void *parse_driver_settings_string(const char *settingsString); extern status_t get_driver_settings_string(void *_handle, char *buffer, size_t *_bufferSize, bool flat); -extern status_t delete_driver_settings(void *handle); extern const char *get_driver_parameter(void *handle, const char *key, const char *unknownValue, /* key not present */ diff --git a/headers/private/fs_shell/fssh_api_wrapper.h b/headers/private/fs_shell/fssh_api_wrapper.h index a56aa9f910..4e8b5eb966 100644 --- a/headers/private/fs_shell/fssh_api_wrapper.h +++ b/headers/private/fs_shell/fssh_api_wrapper.h @@ -387,7 +387,6 @@ #define unload_driver_settings fssh_unload_driver_settings #define parse_driver_settings_string fssh_parse_driver_settings_string #define get_driver_settings_string fssh_get_driver_settings_string -#define delete_driver_settings fssh_delete_driver_settings #define get_driver_parameter fssh_get_driver_parameter #define get_driver_boolean_parameter fssh_get_driver_boolean_parameter #define get_driver_settings fssh_get_driver_settings diff --git a/headers/private/fs_shell/fssh_driver_settings.h b/headers/private/fs_shell/fssh_driver_settings.h index a0d51f2416..96cecc519c 100644 --- a/headers/private/fs_shell/fssh_driver_settings.h +++ b/headers/private/fs_shell/fssh_driver_settings.h @@ -31,7 +31,6 @@ extern void* fssh_parse_driver_settings_string( const char *settingsString); extern fssh_status_t fssh_get_driver_settings_string(void *_handle, char *buffer, fssh_size_t *_bufferSize, bool flat); -extern fssh_status_t fssh_delete_driver_settings(void *handle); extern const char* fssh_get_driver_parameter(void *handle, const char *key, const char *unknownValue, /* key not present */ diff --git a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp index 88923bb32d..deb657d559 100644 --- a/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp +++ b/src/add-ons/disk_systems/intel/ExtendedPartitionAddOn.cpp @@ -201,10 +201,10 @@ ExtendedPartitionHandle::Init() if (buffer != NULL) ptsOffset = strtoull(buffer, NULL, 10); else { - delete_driver_settings(handle); + unload_driver_settings(handle); return B_BAD_VALUE; } - delete_driver_settings(handle); + unload_driver_settings(handle); LogicalPartition* logical = new(nothrow) LogicalPartition; if (!logical) diff --git a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp index 04a15a8322..e8d476d541 100644 --- a/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp +++ b/src/add-ons/disk_systems/intel/PartitionMapAddOn.cpp @@ -257,7 +257,7 @@ PartitionMapHandle::GetNextSupportedType(const BMutablePartition* child, index++; if (nextType->used) break; - } +} if (!nextType) return B_ENTRY_NOT_FOUND; @@ -305,7 +305,7 @@ PartitionMapHandle::ValidateSetParameters(const BMutablePartition* child, if (handle == NULL) return B_BAD_DATA; - delete_driver_settings(handle); + unload_driver_settings(handle); return B_OK; } @@ -320,7 +320,7 @@ PartitionMapHandle::SetParameters(BMutablePartition* child, return B_BAD_DATA; bool active = get_driver_boolean_parameter(handle, "active", false, true); - delete_driver_settings(handle); + unload_driver_settings(handle); // Update our local state PrimaryPartition* partition = (PrimaryPartition*)child->ChildCookie(); @@ -373,7 +373,7 @@ PartitionMapHandle::ValidateCreateChild(off_t* _offset, off_t* _size, if (handle == NULL) return B_ERROR; get_driver_boolean_parameter(handle, "active", false, true); - delete_driver_settings(handle); + unload_driver_settings(handle); // do we have a spare primary partition? if (fPartitionMap.CountNonEmptyPrimaryPartitions() == 4) @@ -489,7 +489,7 @@ PartitionMapHandle::CreateChild(off_t offset, off_t size, return B_ERROR; bool active = get_driver_boolean_parameter(handle, "active", false, true); - delete_driver_settings(handle); + unload_driver_settings(handle); // get a spare primary partition PrimaryPartition* primary = NULL; diff --git a/src/add-ons/kernel/file_systems/bfs/bfs_disk_system.cpp b/src/add-ons/kernel/file_systems/bfs/bfs_disk_system.cpp index 496e2b597a..4948049038 100644 --- a/src/add-ons/kernel/file_systems/bfs/bfs_disk_system.cpp +++ b/src/add-ons/kernel/file_systems/bfs/bfs_disk_system.cpp @@ -31,7 +31,7 @@ parse_initialize_parameters(const char* parameterString, if (string != NULL) blockSize = strtoul(string, NULL, 0); - delete_driver_settings(handle); + unload_driver_settings(handle); if (blockSize != 1024 && blockSize != 2048 && blockSize != 4096 && blockSize != 8192) { diff --git a/src/add-ons/kernel/file_systems/btrfs/btrfs_disk_system.cpp b/src/add-ons/kernel/file_systems/btrfs/btrfs_disk_system.cpp index 64d457b748..7ec26ef595 100644 --- a/src/add-ons/kernel/file_systems/btrfs/btrfs_disk_system.cpp +++ b/src/add-ons/kernel/file_systems/btrfs/btrfs_disk_system.cpp @@ -38,7 +38,7 @@ parse_initialize_parameters(const char* parameterString, // TODO(lesderid): accept more settings (allocation profiles, uuid, etc.) - delete_driver_settings(handle); + unload_driver_settings(handle); if ((blockSize != 1024 && blockSize != 2048 && blockSize != 4096 && blockSize != 8192 && blockSize != 16384) diff --git a/src/add-ons/kernel/file_systems/fat/mkdos.cpp b/src/add-ons/kernel/file_systems/fat/mkdos.cpp index 836e4b7413..fcf82761e8 100644 --- a/src/add-ons/kernel/file_systems/fat/mkdos.cpp +++ b/src/add-ons/kernel/file_systems/fat/mkdos.cpp @@ -57,7 +57,7 @@ parse_initialize_parameters(const char* parameterString, if (string != NULL) fatBits = strtoul(string, NULL, 0); - delete_driver_settings(handle); + unload_driver_settings(handle); if (fatBits != 0 && fatBits != 12 && fatBits != 16 && fatBits != 32) { dprintf("mkdos error: fat must be 12, 16, or 32 bits\n"); diff --git a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp index dda012f76d..d651d5e89f 100644 --- a/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp +++ b/src/add-ons/kernel/partitioning_systems/intel/write_support.cpp @@ -1283,7 +1283,7 @@ pm_set_parameters(int fd, partition_id partitionID, const char* parameters, return B_ERROR; bool active = get_driver_boolean_parameter(handle, "active", false, true); - delete_driver_settings(handle); + unload_driver_settings(handle); // if the old type is the same, there is nothing to do if (primary->Active() == active) { @@ -1450,7 +1450,7 @@ pm_create_child(int fd, partition_id partitionID, off_t offset, off_t size, return B_ERROR; bool active = get_driver_boolean_parameter(handle, "active", false, true); - delete_driver_settings(handle); + unload_driver_settings(handle); // set the active flags to false if (active) { @@ -2226,10 +2226,10 @@ ep_create_child(int fd, partition_id partitionID, off_t offset, off_t size, if (buffer != NULL) ptsOffset = strtoull(buffer, NULL, 10); else { - delete_driver_settings(handle); + unload_driver_settings(handle); return B_BAD_VALUE; } - delete_driver_settings(handle); + unload_driver_settings(handle); // check the partition location if (!check_partition_location_ep(partition, offset, size, ptsOffset)) diff --git a/src/apps/drivesetup/InitParametersPanel.cpp b/src/apps/drivesetup/InitParametersPanel.cpp index e59aa8d2da..ad6d50976c 100644 --- a/src/apps/drivesetup/InitParametersPanel.cpp +++ b/src/apps/drivesetup/InitParametersPanel.cpp @@ -48,7 +48,7 @@ InitParametersPanel::Go(BString& name, BString& parameters) const char* string = get_driver_parameter(handle, "name", NULL, NULL); name.SetTo(string); - delete_driver_settings(handle); + unload_driver_settings(handle); } } diff --git a/src/apps/drivesetup/PartitionList.cpp b/src/apps/drivesetup/PartitionList.cpp index 2c44051832..4b5d363318 100644 --- a/src/apps/drivesetup/PartitionList.cpp +++ b/src/apps/drivesetup/PartitionList.cpp @@ -352,7 +352,7 @@ PartitionListRow::PartitionListRow(BPartition* partition) true); appendParameter(parameters, active, B_TRANSLATE("Active")); - delete_driver_settings(handle); + unload_driver_settings(handle); } } diff --git a/src/servers/launch/SettingsParser.cpp b/src/servers/launch/SettingsParser.cpp index b5e1d5de97..8af3922b7f 100644 --- a/src/servers/launch/SettingsParser.cpp +++ b/src/servers/launch/SettingsParser.cpp @@ -236,7 +236,7 @@ SettingsParser::Parse(const char* text, BMessage& settings) status_t status = adapter.ConvertFromDriverSettings( *get_driver_settings(driverSettings), kSettingsTemplate, settings); - delete_driver_settings(driverSettings); + unload_driver_settings(driverSettings); return status; } diff --git a/src/system/libroot/os/driver_settings.cpp b/src/system/libroot/os/driver_settings.cpp index 212a2ecff5..cba2029c7f 100644 --- a/src/system/libroot/os/driver_settings.cpp +++ b/src/system/libroot/os/driver_settings.cpp @@ -954,8 +954,12 @@ get_driver_settings(void *handle) } -status_t -delete_driver_settings(void *_handle) -{ - return unload_driver_settings(_handle); -} +#if defined(HAIKU_TARGET_PLATFORM_HAIKU) \ + && (defined(__i386__) || defined(__x86_64__)) + +// Obsolete function, use unload_driver_settings instead. Introduced by +// accident in hrev3530 (2003) and present in public headers for a long time. +extern "C" __typeof(unload_driver_settings) delete_driver_settings + __attribute__((weak, alias ("unload_driver_settings"))); + +#endif diff --git a/src/system/libroot/stubbed/libroot_stubs.c b/src/system/libroot/stubbed/libroot_stubs.c index 1ace035e55..bd06db4de3 100644 --- a/src/system/libroot/stubbed/libroot_stubs.c +++ b/src/system/libroot/stubbed/libroot_stubs.c @@ -1895,7 +1895,6 @@ void debug_thread() {} void debug_vprintf() {} void debugger() {} void delete_area() {} -void delete_driver_settings() {} void delete_port() {} void delete_sem() {} void dev_for_path() {} diff --git a/src/system/libroot/stubbed/libroot_stubs_legacy.c b/src/system/libroot/stubbed/libroot_stubs_legacy.c index b1ea45746a..4c8cd83e95 100644 --- a/src/system/libroot/stubbed/libroot_stubs_legacy.c +++ b/src/system/libroot/stubbed/libroot_stubs_legacy.c @@ -1798,7 +1798,6 @@ void debug_thread() {} void debug_vprintf() {} void debugger() {} void delete_area() {} -void delete_driver_settings() {} void delete_port() {} void delete_sem() {} void dev_for_path() {} diff --git a/src/tests/kits/shared/DriverSettingsMessageAdapterTest.cpp b/src/tests/kits/shared/DriverSettingsMessageAdapterTest.cpp index b369a6b316..259dc64fb5 100644 --- a/src/tests/kits/shared/DriverSettingsMessageAdapterTest.cpp +++ b/src/tests/kits/shared/DriverSettingsMessageAdapterTest.cpp @@ -39,7 +39,7 @@ public: ~Settings() { - delete_driver_settings(fSettings); + unload_driver_settings(fSettings); } private: diff --git a/src/tests/system/libroot/os/DriverSettingsTest.cpp b/src/tests/system/libroot/os/DriverSettingsTest.cpp index e4a2ed6f42..660e74e46b 100644 --- a/src/tests/system/libroot/os/DriverSettingsTest.cpp +++ b/src/tests/system/libroot/os/DriverSettingsTest.cpp @@ -136,7 +136,7 @@ print_settings(void *handle) const driver_settings *settings = get_driver_settings(reparsedHandle); dump_settings(*settings); - delete_driver_settings(reparsedHandle); + unload_driver_settings(reparsedHandle); bufferSize = sizeof(buffer); if (get_driver_settings_string(handle, buffer, &bufferSize, true) < B_OK) { @@ -155,7 +155,7 @@ print_settings(void *handle) settings = get_driver_settings(reparsedHandle); dump_settings(*settings); - delete_driver_settings(reparsedHandle); + unload_driver_settings(reparsedHandle); } @@ -181,7 +181,7 @@ check_settings_string(uint32 num) } print_settings(handle); - delete_driver_settings(handle); + unload_driver_settings(handle); } diff --git a/src/tools/fs_shell/driver_settings.cpp b/src/tools/fs_shell/driver_settings.cpp index ce6b419107..4cbda9abf0 100644 --- a/src/tools/fs_shell/driver_settings.cpp +++ b/src/tools/fs_shell/driver_settings.cpp @@ -862,10 +862,3 @@ fssh_get_driver_settings(void *handle) return &((settings_handle *)handle)->settings; } - - -fssh_status_t -fssh_delete_driver_settings(void *handle) -{ - return fssh_unload_driver_settings(handle); -}