colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

all: replace struct in_addr with guint32

Browse Source
This commit is contained in:
Pavel Šimerda
2013-07-31 23:59:50 +02:00
committed by Dan Williams
parent 6762b2f792
commit 320a9d16a3
26 changed files with 215 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cli/src/utils.c
View File

@@ -175,19 +175,19 @@ ssid_to_hex (const char *str, gsize len)
char *
nmc_ip4_address_as_string (guint32 ip, GError **error)
{
struct in_addr tmp_addr;
guint32 tmp_addr;
char buf[INET_ADDRSTRLEN];
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
memset (&buf, '\0', sizeof (buf));
tmp_addr.s_addr = ip;
tmp_addr = ip;
if (inet_ntop (AF_INET, &tmp_addr, buf, INET_ADDRSTRLEN)) {
return g_strdup (buf);
} else {
g_set_error (error, NMCLI_ERROR, 0, _("Error converting IP4 address '0x%X' to text form"),
ntohl (tmp_addr.s_addr));
ntohl (tmp_addr));
return NULL;
}
}