shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 10:51:20 +03:00
Code

terminal: fix missing hashmap_new() conversions

Browse Source 
hashmap_new() now takes *_ops instead of individual functions. Fix up any
missing invokations of it that haven't been converted already.
This commit is contained in:
David Herrmann 2014-09-15 17:12:41 +02:00
parent 1acf166349
commit 440046e922
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsystemd-terminal/idev.c
View File

@ -454,11 +454,11 @@ int idev_session_new(idev_session **out,
return r;
}
s->element_map = hashmap_new(string_hash_func, string_compare_func);
s->element_map = hashmap_new(&string_hash_ops);
if (!s->element_map)
return -ENOMEM;
s->device_map = hashmap_new(string_hash_func, string_compare_func);
s->device_map = hashmap_new(&string_hash_ops);
if (!s->device_map)
return -ENOMEM;
@ -647,11 +647,11 @@ int idev_context_new(idev_context **out, sd_event *event, sd_bus *sysbus) {
if (sysbus)
c->sysbus = sd_bus_ref(sysbus);
c->session_map = hashmap_new(string_hash_func, string_compare_func);
c->session_map = hashmap_new(&string_hash_ops);
if (!c->session_map)
return -ENOMEM;
c->data_map = hashmap_new(string_hash_func, string_compare_func);
c->data_map = hashmap_new(&string_hash_ops);
if (!c->data_map)
return -ENOMEM;

10
src/libsystemd-terminal/sysview.c
View File

@ -368,11 +368,11 @@ int sysview_seat_new(sysview_seat **out, sysview_context *c, const char *name) {
if (!seat->name)
return -ENOMEM;
seat->session_map = hashmap_new(string_hash_func, string_compare_func);
seat->session_map = hashmap_new(&string_hash_ops);
if (!seat->session_map)
return -ENOMEM;
seat->device_map = hashmap_new(string_hash_func, string_compare_func);
seat->device_map = hashmap_new(&string_hash_ops);
if (!seat->device_map)
return -ENOMEM;
@ -767,15 +767,15 @@ int sysview_context_new(sysview_context **out,
return errno > 0 ? -errno : -EFAULT;
}
c->seat_map = hashmap_new(string_hash_func, string_compare_func);
c->seat_map = hashmap_new(&string_hash_ops);
if (!c->seat_map)
return -ENOMEM;
c->session_map = hashmap_new(string_hash_func, string_compare_func);
c->session_map = hashmap_new(&string_hash_ops);
if (!c->session_map)
return -ENOMEM;
c->device_map = hashmap_new(string_hash_func, string_compare_func);
c->device_map = hashmap_new(&string_hash_ops);
if (!c->device_map)
return -ENOMEM;