dlm: master - dlm: fix void arithmetic
Fabio M. Di Nitto
fabbione@fedoraproject.org
Tue Jun 23 08:21:00 GMT 2009
Gitweb: http://git.fedorahosted.org/git/dlm.git?p=dlm.git;a=commitdiff;h=e9d72aa3737d9233d761ab0abbecbc5257106326
Commit: e9d72aa3737d9233d761ab0abbecbc5257106326
Parent: c2048b9fb6b342ce754f479cbda38728de623617
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 Jun 23 09:43:35 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 68f2e19..bbdaeb4 100644
--- a/dlm/libdlmcontrol/main.c
+++ b/dlm/libdlmcontrol/main.c
@@ -18,7 +18,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)
@@ -35,7 +35,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 a972896..a64f909 100644
--- a/dlm/tool/main.c
+++ b/dlm/tool/main.c
@@ -361,7 +361,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