summaryrefslogtreecommitdiffstats
path: root/isys
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2008-02-08 18:41:37 -1000
committerDavid Cantrell <dcantrell@redhat.com>2008-02-08 18:41:37 -1000
commitc71fadef7ba371192e744c44e17ca4aba66bd403 (patch)
tree5165708ac4e5015a3e9c5c0b966e779e6a4b37fc /isys
parente0e631492e43a1e3a2a0c4fbb8b31fa7a239f869 (diff)
downloadanaconda-c71fadef7ba371192e744c44e17ca4aba66bd403.tar.gz
anaconda-c71fadef7ba371192e744c44e17ca4aba66bd403.tar.xz
anaconda-c71fadef7ba371192e744c44e17ca4aba66bd403.zip
Update error messages to match function names.
Diffstat (limited to 'isys')
-rw-r--r--isys/iface.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/isys/iface.c b/isys/iface.c
index e7ee0e3e4..51f923c06 100644
--- a/isys/iface.c
+++ b/isys/iface.c
@@ -37,18 +37,18 @@ struct nl_cache *iface_get_link_cache(struct nl_handle **handle) {
struct nl_cache *cache = NULL;
if ((*handle = nl_handle_alloc()) == NULL) {
- perror("nl_handle_alloc() failure in nl_get_link_cache()");
+ perror("nl_handle_alloc() failure in iface_get_link_cache()");
return NULL;
}
if (nl_connect(*handle, NETLINK_ROUTE)) {
- perror("nl_connect() failure in nl_get_link_cache()");
+ perror("nl_connect() failure in iface_get_link_cache()");
nl_handle_destroy(*handle);
return NULL;
}
if ((cache = rtnl_link_alloc_cache(*handle)) == NULL) {
- perror("rtnl_link_alloc_cache() failure in nl_get_link_cache()");
+ perror("rtnl_link_alloc_cache() failure in iface_get_link_cache()");
nl_close(*handle);
nl_handle_destroy(*handle);
return NULL;
@@ -75,25 +75,25 @@ char *iface_ip2str(char *ifname) {
struct nl_addr *addr = NULL;
if (ifname == NULL) {
- perror("Missing ifname in nl_ip2str()");
+ perror("Missing ifname in iface_ip2str()");
return NULL;
}
if ((cache = iface_get_link_cache(&handle)) == NULL) {
- perror("nl_get_link_cache() failure in nl_ip2str()");
+ perror("iface_get_link_cache() failure in iface_ip2str()");
return NULL;
}
ifindex = rtnl_link_name2i(cache, ifname);
if ((cache = rtnl_addr_alloc_cache(handle)) == NULL) {
- perror("rtnl_addr_alloc_cache() failure in nl_ip2str()");
+ perror("rtnl_addr_alloc_cache() failure in iface_ip2str()");
goto ip2str_error;
}
/* find the IPv4 and IPv6 addresses for this interface */
if ((obj = nl_cache_get_first(cache)) == NULL) {
- perror("nl_cache_get_first() failure in nl_ip2str()");
+ perror("nl_cache_get_first() failure in iface_ip2str()");
goto ip2str_error;
}
@@ -129,7 +129,7 @@ char *iface_ip2str(char *ifname) {
buflen += 1;
if ((buf = malloc(buflen)) == NULL) {
- perror("malloc() failure on buf in nl_ip2str()");
+ perror("malloc() failure on buf in iface_ip2str()");
nl_addr_destroy(addr);
goto ip2str_error;
}
@@ -141,7 +141,7 @@ char *iface_ip2str(char *ifname) {
if ((pos = index(buf, '/')) != NULL) {
*pos = '\0';
if ((buf = realloc(buf, strlen(buf) + 1)) == NULL) {
- perror("realloc() failure on buf in nl_ip2str()");
+ perror("realloc() failure on buf in iface_ip2str()");
nl_addr_destroy(addr);
goto ip2str_error;
}
@@ -193,27 +193,27 @@ char *iface_mac2str(char *ifname) {
struct nl_addr *addr = NULL;
if (ifname == NULL) {
- perror("Missing ifname in nl_mac2str()");
+ perror("Missing ifname in iface_mac2str()");
return NULL;
}
if ((cache = iface_get_link_cache(&handle)) == NULL) {
- perror("nl_get_link_cache() failure in nl_mac2str()");
+ perror("iface_get_link_cache() failure in iface_mac2str()");
return NULL;
}
if ((link = rtnl_link_get_by_name(cache, ifname)) == NULL) {
- perror("rtnl_link_get_by_name() failure in nl_mac2str()");
+ perror("rtnl_link_get_by_name() failure in iface_mac2str()");
goto mac2str_error2;
}
if ((addr = rtnl_link_get_addr(link)) == NULL) {
- perror("rtnl_link_get_addr() failure in nl_mac2str()");
+ perror("rtnl_link_get_addr() failure in iface_mac2str()");
goto mac2str_error3;
}
if ((buf = malloc(buflen)) == NULL) {
- perror("malloc() failure on buf in nl_mac2str()");
+ perror("malloc() failure on buf in iface_mac2str()");
goto mac2str_error4;
}