diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2015-07-01 10:28:43 +0200 |
---|---|---|
committer | Tobias Klauser <tklauser@distanz.ch> | 2015-07-01 10:30:06 +0200 |
commit | e3bd65b7eaa5b47b4029f92e909a6aae4fbdb152 (patch) | |
tree | 7ece8f21e7f63dbec3e32ba4ba1bee30f4a9b614 | |
parent | f6b2b535d482084e49ba8787973d8586ed51f563 (diff) |
netsniff-ng: dev: Rename device_ifindex_get to __device_ifindex
Make the function name more in line with the scheme we use for other
similar functions: the function prefixed with __ returns a negative
error code, the function without prefix panic()'s on error.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rw-r--r-- | dev.c | 4 | ||||
-rw-r--r-- | dev.h | 2 | ||||
-rw-r--r-- | mac80211.c | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -14,7 +14,7 @@ #include "link.h" #include "built_in.h" -int device_ifindex_get(const char *ifname) +int __device_ifindex(const char *ifname) { int ret, sock, index; struct ifreq ifr; @@ -40,7 +40,7 @@ int device_ifindex_get(const char *ifname) int device_ifindex(const char *ifname) { - int index = device_ifindex_get(ifname); + int index = __device_ifindex(ifname); if (unlikely(index < 0)) panic("Cannot get ifindex from device!\n"); @@ -6,8 +6,8 @@ extern size_t device_mtu(const char *ifname); extern int device_address(const char *ifname, int af, struct sockaddr_storage *ss); +extern int __device_ifindex(const char *ifname); extern int device_ifindex(const char *ifname); -extern int device_ifindex_get(const char *ifname); extern int device_type(const char *ifname); extern short device_get_flags(const char *ifname); extern void device_set_flags(const char *ifname, const short flags); @@ -227,7 +227,7 @@ void enter_rfmon_mac80211(const char *device, char **mondev) slprintf(mondevice, sizeof(mondevice), "mon%u", n); - if (device_ifindex_get(mondevice) > 0) + if (__device_ifindex(mondevice) > 0) continue; ret = nl80211_add_mon_if(&nlstate, device, mondevice); |