From cf6a8911738fe2635a5210769d5348b05b166691 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 13 Feb 2014 03:44:14 +0100 Subject: rtnl: drop "sd_" prefix from cleanup macros The "sd_" prefix is supposed to be used on exported symbols only, and not in the middle of names. Let's drop it from the cleanup macros hence, to make things simpler. The bus cleanup macros don't carry the "sd_" either, so this brings the APIs a bit nearer. --- src/libsystemd/sd-rtnl/sd-rtnl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libsystemd/sd-rtnl/sd-rtnl.c') diff --git a/src/libsystemd/sd-rtnl/sd-rtnl.c b/src/libsystemd/sd-rtnl/sd-rtnl.c index 04fcb3d002..05889656f9 100644 --- a/src/libsystemd/sd-rtnl/sd-rtnl.c +++ b/src/libsystemd/sd-rtnl/sd-rtnl.c @@ -71,7 +71,7 @@ static bool rtnl_pid_changed(sd_rtnl *rtnl) { } int sd_rtnl_open(uint32_t groups, sd_rtnl **ret) { - _cleanup_sd_rtnl_unref_ sd_rtnl *rtnl = NULL; + _cleanup_rtnl_unref_ sd_rtnl *rtnl = NULL; socklen_t addrlen; int r; @@ -241,7 +241,7 @@ static int dispatch_wqueue(sd_rtnl *rtnl) { } static int process_timeout(sd_rtnl *rtnl) { - _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *m = NULL; + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; struct reply_callback *c; usec_t n; int r; @@ -315,7 +315,7 @@ static int process_match(sd_rtnl *rtnl, sd_rtnl_message *m) { } static int process_running(sd_rtnl *rtnl, sd_rtnl_message **ret) { - _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *m = NULL; + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; int r; assert(rtnl); @@ -557,7 +557,7 @@ int sd_rtnl_call(sd_rtnl *nl, for (;;) { usec_t left; - _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *incoming = NULL; + _cleanup_rtnl_message_unref_ sd_rtnl_message *incoming = NULL; if (!room) { sd_rtnl_message **q; -- cgit v1.2.3-54-g00ecf