]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
networkd: remove duplicate macro definitions
authorLennart Poettering <lennart@poettering.net>
Thu, 27 Nov 2014 23:41:38 +0000 (00:41 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 28 Nov 2014 01:17:50 +0000 (02:17 +0100)
src/network/networkd.h

index 263cc61eefb41597eb09cde56d1ec65c70635032..1f31023329146f6742a56208fcd76fa3c2463d53 100644 (file)
@@ -333,20 +333,3 @@ int address_pool_new_from_string(Manager *m, AddressPool **ret, int family, cons
 void address_pool_free(AddressPool *p);
 
 int address_pool_acquire(AddressPool *p, unsigned prefixlen, union in_addr_union *found);
-
-/* Macros which append INTERFACE= to the message */
-
-#define log_link_full(level, link, fmt, ...) log_object_internal(level, 0, __FILE__, __LINE__, __func__, "INTERFACE=", link->ifname, "%-*s: " fmt, IFNAMSIZ, link->ifname, ##__VA_ARGS__)
-#define log_link_debug(link, ...)       log_link_full(LOG_DEBUG, link, ##__VA_ARGS__)
-#define log_link_info(link, ...)        log_link_full(LOG_INFO, link, ##__VA_ARGS__)
-#define log_link_notice(link, ...)      log_link_full(LOG_NOTICE, link, ##__VA_ARGS__)
-#define log_link_warning(link, ...)     log_link_full(LOG_WARNING, link, ##__VA_ARGS__)
-#define log_link_error(link, ...)       log_link_full(LOG_ERR, link, ##__VA_ARGS__)
-
-#define log_link_struct(level, link, ...) log_struct(level, "INTERFACE=%s", link->ifname, __VA_ARGS__)
-
-#define ADDRESS_FMT_VAL(address)            \
-        (address).s_addr & 0xFF,            \
-        ((address).s_addr >> 8) & 0xFF,     \
-        ((address).s_addr >> 16) & 0xFF,    \
-        (address).s_addr >> 24