diff options
author | Patrick McHardy <kaber@trash.net> | 2010-08-02 05:25:03 +0200 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2010-08-02 05:25:03 +0200 |
commit | 7c0e516ed9b5e7e40597e5913ed7f82700d045d2 (patch) | |
tree | 4285e6958c1272d9b6f5b595c53b8bf7a667e017 /src/netlink.c | |
parent | 3d125cbc83af00f5b73e9a74be9a21de10f4f0c2 (diff) |
libdect: name timer related functions more consistently
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'src/netlink.c')
-rw-r--r-- | src/netlink.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/netlink.c b/src/netlink.c index 6d974ce..f82feeb 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -273,13 +273,13 @@ int dect_netlink_init(struct dect_handle *dh, const char *cluster) if (err < 0) goto err2; - dh->nlfd = dect_alloc_fd(dh); + dh->nlfd = dect_fd_alloc(dh); if (dh->nlfd == NULL) goto err2; dh->nlfd->fd = nl_socket_get_fd(dh->nlsock); - dect_setup_fd(dh->nlfd, dect_netlink_event, NULL); - if (dect_register_fd(dh, dh->nlfd, DECT_FD_READ)) + dect_fd_setup(dh->nlfd, dect_netlink_event, NULL); + if (dect_fd_register(dh, dh->nlfd, DECT_FD_READ)) goto err3; err = dect_netlink_get_cluster(dh, cluster); @@ -299,7 +299,7 @@ int dect_netlink_init(struct dect_handle *dh, const char *cluster) return 0; err4: - dect_unregister_fd(dh, dh->nlfd); + dect_fd_unregister(dh, dh->nlfd); err3: dect_free(dh, dh->nlfd); err2: @@ -313,7 +313,7 @@ err1: void dect_netlink_exit(struct dect_handle *dh) { - dect_unregister_fd(dh, dh->nlfd); + dect_fd_unregister(dh, dh->nlfd); nl_close(dh->nlsock); nl_socket_free(dh->nlsock); dect_free(dh, dh->nlfd); |