libroot: remove delete_driver_settings

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 <[email protected]>

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 */

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 */

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

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 */

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)

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;

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) {

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)

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");

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))

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);
 		}
 	}
 

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);
 		}
 	}
 

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;
 }
 

src/system/libroot/os/driver_settings.cpp

@@ -954,8 +954,12 @@ get_driver_settings(void *handle)
 }
 
 
-status_t
+#if defined(HAIKU_TARGET_PLATFORM_HAIKU) \
-delete_driver_settings(void *_handle)
+	&& (defined(__i386__) || defined(__x86_64__))
-{
+
-	return unload_driver_settings(_handle);
+// 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

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() {}

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() {}

src/tests/kits/shared/DriverSettingsMessageAdapterTest.cpp

@@ -39,7 +39,7 @@ public:
 
 	~Settings()
 	{
-		delete_driver_settings(fSettings);
+		unload_driver_settings(fSettings);
 	}
 
 private:

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);
 }
 
 

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);
-}