[batctl] next: batctl: Remove legacy types u64 and caddr_t (0a88d31) - commits - lists.open-mesh.org

13 Sep 2013

Repository : ssh://git@open-mesh.org/batctl
On branch  : next
...

commit 0a88d31bd917981a1ff482fd154ca4165ffc216e
Author: Sven Eckelmann sven@narfation.org
Date:   Tue Sep 10 23:11:57 2013 +0200
batctl: Remove legacy types u64 and caddr_t
The definition of u64 was not obtained from the correct source to always use 64
    bit. Instead uint64_t can be used.
Also caddr_t is obsolete BSDism and void* should be used instead.
Signed-off-by: Sven Eckelmann sven@narfation.org
    Signed-off-by: Marek Lindner mareklindner@neomailbox.ch
...

0a88d31bd917981a1ff482fd154ca4165ffc216e
 ioctl.c |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ioctl.c b/ioctl.c
index 26bb482..3d5b50d 100644
--- a/ioctl.c
+++ b/ioctl.c
@@ -30,13 +30,12 @@
 #include <linux/if.h>
 #include <linux/sockios.h>
 #include <linux/ethtool.h>
+#include <stdint.h>
#include "main.h"
 #include "ioctl.h"
 #include "debugfs.h"
-typedef unsigned long long u64;
-
 /* code borrowed from ethtool */
 static int statistics_custom_get(int fd, struct ifreq *ifr)
 {
@@ -47,7 +46,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr)
    int err, ret = EXIT_FAILURE;
drvinfo.cmd = ETHTOOL_GDRVINFO;
-	ifr->ifr_data = (caddr_t)&drvinfo;
+	ifr->ifr_data = (void *)&drvinfo;
    err = ioctl(fd, SIOCETHTOOL, ifr);
    if (err < 0) {
    	fprintf(stderr, "Error - can't open driver information: %s\n", strerror(errno));
@@ -59,7 +58,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr)
    	goto success;
sz_str = n_stats * ETH_GSTRING_LEN;
-	sz_stats = n_stats * sizeof(u64);
+	sz_stats = n_stats * sizeof(uint64_t);
strings = calloc(1, sz_str + sizeof(struct ethtool_gstrings));
    stats = calloc(1, sz_stats + sizeof(struct ethtool_stats));
@@ -71,7 +70,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr)
    strings->cmd = ETHTOOL_GSTRINGS;
    strings->string_set = ETH_SS_STATS;
    strings->len = n_stats;
-	ifr->ifr_data = (caddr_t)strings;
+	ifr->ifr_data = (void *)strings;
    err = ioctl(fd, SIOCETHTOOL, ifr);
    if (err < 0) {
    	fprintf(stderr, "Error - can't get stats strings information: %s\n", strerror(errno));
@@ -80,7 +79,7 @@ static int statistics_custom_get(int fd, struct ifreq *ifr)
stats->cmd = ETHTOOL_GSTATS;
    stats->n_stats = n_stats;
-	ifr->ifr_data = (caddr_t) stats;
+	ifr->ifr_data = (void *) stats;
    err = ioctl(fd, SIOCETHTOOL, ifr);
    if (err < 0) {
    	fprintf(stderr, "Error - can't get stats information: %s\n", strerror(errno));

    