dlm: master - group: fix void arithmetic

["Fabio M. Di Nitto" <fabbione@fedoraproject.org>]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2793 bytes --]

Gitweb:        http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=e4b3cfe6af126234715bc2bb51c0e4d1c8bab4ab
Commit:        e4b3cfe6af126234715bc2bb51c0e4d1c8bab4ab
Parent:        16daac0e280bae8b2417169ad4dfedf1f8b84282
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Tue May 12 14:24:42 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue Jun 23 10:57:19 2009 +0200

group: fix void arithmetic

stable3/group/dlm_controld/main.c: In function ‘do_read’:
stable3/group/dlm_controld/main.c:35: warning: pointer of type ‘void *’ used in arithmetic
stable3/group/dlm_controld/main.c: In function ‘do_write’:
stable3/group/dlm_controld/main.c:52: warning: pointer of type ‘void *’ used in arithmetic

stable3/group/dlm_controld/netlink.c: In function ‘send_genetlink_cmd’:
stable3/group/dlm_controld/netlink.c:44: warning: pointer of type ‘void *’ used in arithmetic
stable3/group/dlm_controld/netlink.c: In function ‘get_family_id’:
stable3/group/dlm_controld/netlink.c:93: warning: pointer of type ‘void *’ used in arithmetic
stable3/group/dlm_controld/netlink.c: In function ‘process_netlink’:
stable3/group/dlm_controld/netlink.c:221: warning: pointer of type ‘void *’ used in arithmetic

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 group/dlm_controld/main.c    |    4 ++--
 group/dlm_controld/netlink.c |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index ec1616a..88f095c 100644
--- a/group/dlm_controld/main.c
+++ b/group/dlm_controld/main.c
@@ -32,7 +32,7 @@ int do_read(int fd, void *buf, size_t count)
 	int rv, off = 0;
 
 	while (off < count) {
-		rv = read(fd, buf + off, count - off);
+		rv = read(fd, (char *)buf + off, count - off);
 		if (rv == 0)
 			return -1;
 		if (rv == -1 && errno == EINTR)
@@ -49,7 +49,7 @@ int do_write(int fd, void *buf, size_t count)
 	int rv, off = 0;
 
  retry:
-	rv = write(fd, buf + off, count);
+	rv = write(fd, (char *)buf + off, count);
 	if (rv == -1 && errno == EINTR)
 		goto retry;
 	if (rv < 0) {
diff --git a/group/dlm_controld/netlink.c b/group/dlm_controld/netlink.c
index 5a7c261..63122f7 100644
--- a/group/dlm_controld/netlink.c
+++ b/group/dlm_controld/netlink.c
@@ -9,7 +9,7 @@
 
 /* FIXME: look into using libnl/libnetlink */
 
-#define GENLMSG_DATA(glh)       ((void *)(NLMSG_DATA(glh) + GENL_HDRLEN))
+#define GENLMSG_DATA(glh)       ((void *)((char *)NLMSG_DATA(glh) + GENL_HDRLEN))
 #define GENLMSG_PAYLOAD(glh)    (NLMSG_PAYLOAD(glh, 0) - GENL_HDRLEN)
 #define NLA_DATA(na)	    	((void *)((char*)(na) + NLA_HDRLEN))
 #define NLA_PAYLOAD(len)	(len - NLA_HDRLEN)