cluster: STABLE3 - dlm: fix void arithmetic

Fabio M. Di Nitto fabbione@fedoraproject.org
Tue May 12 12:17:00 GMT 2009


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=68465efaae9739579bd907158d520b25bffc20cc
Commit:        68465efaae9739579bd907158d520b25bffc20cc
Parent:        faab5b4212b0e4777648723942cda19cbd192a14
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Tue May 12 14:16:23 2009 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Tue May 12 14:16:23 2009 +0200

dlm: fix void arithmetic

stable3/dlm/libdlmcontrol/main.c: In function ‘do_read’:
stable3/dlm/libdlmcontrol/main.c:19: warning: pointer of type ‘void *’ used in arithmetic
stable3/dlm/libdlmcontrol/main.c: In function ‘do_write’:
stable3/dlm/libdlmcontrol/main.c:36: warning: pointer of type ‘void *’ used in arithmetic

stable3/dlm/tool/main.c: In function ‘do_write’:
stable3/dlm/tool/main.c:362: warning: pointer of type ‘void *’ used in arithmetic

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

diff --git a/dlm/libdlmcontrol/main.c b/dlm/libdlmcontrol/main.c
index 5731c85..f2f6365 100644
--- a/dlm/libdlmcontrol/main.c
+++ b/dlm/libdlmcontrol/main.c
@@ -16,7 +16,7 @@ static 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)
@@ -33,7 +33,7 @@ static 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/dlm/tool/main.c b/dlm/tool/main.c
index bce0a01..3f46179 100644
--- a/dlm/tool/main.c
+++ b/dlm/tool/main.c
@@ -359,7 +359,7 @@ static 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)



More information about the Cluster-cvs mailing list