Oops, the driver name was not propagated as needed.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10644 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -390,7 +390,7 @@ free_settings(settings_handle *handle)
|
|||||||
|
|
||||||
|
|
||||||
static void *
|
static void *
|
||||||
new_settings(char *buffer)
|
new_settings(char *buffer, const char *driverName)
|
||||||
{
|
{
|
||||||
settings_handle *handle = malloc(sizeof(settings_handle));
|
settings_handle *handle = malloc(sizeof(settings_handle));
|
||||||
if (handle == NULL)
|
if (handle == NULL)
|
||||||
@@ -434,7 +434,7 @@ load_driver_settings_from_file(int file, const char *driverName)
|
|||||||
// make sure the string is null terminated
|
// make sure the string is null terminated
|
||||||
// to avoid misbehaviour
|
// to avoid misbehaviour
|
||||||
|
|
||||||
handle = new_settings(text);
|
handle = new_settings(text, driverName);
|
||||||
if (handle != NULL) {
|
if (handle != NULL) {
|
||||||
// everything went fine!
|
// everything went fine!
|
||||||
return handle;
|
return handle;
|
||||||
@@ -731,7 +731,7 @@ load_driver_settings(const char *driverName)
|
|||||||
while (settings != NULL) {
|
while (settings != NULL) {
|
||||||
if (!strcmp(settings->name, driverName)) {
|
if (!strcmp(settings->name, driverName)) {
|
||||||
// we have it
|
// we have it
|
||||||
return new_settings(settings->buffer);
|
return new_settings(settings->buffer, driverName);
|
||||||
}
|
}
|
||||||
settings = settings->next;
|
settings = settings->next;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user