summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-06-14 06:33:16 +0000
committerNeil Brown <neilb@suse.de>2005-06-14 06:33:16 +0000
commita46f4061d3b35e101651a764582186e5f89b2bea (patch)
tree8c79775dc99ef22573786c1984c8f41f8e689c78
parent1337546dc1f4b4dfd399ecb9ef05e0936492220f (diff)
downloadmdadm-a46f4061d3b35e101651a764582186e5f89b2bea.tar.gz
mdadm-a46f4061d3b35e101651a764582186e5f89b2bea.tar.xz
mdadm-a46f4061d3b35e101651a764582186e5f89b2bea.zip
Fix a few typecasts
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
-rw-r--r--ChangeLog1
-rw-r--r--util.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fdb46f..6e55e62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ Changes Prior to this release
- Allow --auto command line option to set default auto=
value when running "--assemble --scan". Previously
--auto was ignored if --scan was given
+ - Fix a few type casts
Changes Prior to 1.11.0 release
- Fix embarassing bug which causes --add to always fail.
diff --git a/util.c b/util.c
index 05362c7..c349df8 100644
--- a/util.c
+++ b/util.c
@@ -195,8 +195,8 @@ int check_reiser(int fd, char *name)
return 0;
if (read(fd, sb, 1024) != 1024)
return 0;
- if (strncmp(sb+52, "ReIsErFs",8)!=0 &&
- strncmp(sb+52, "ReIsEr2Fs",9)!=0)
+ if (strncmp((char*)sb+52, "ReIsErFs",8)!=0 &&
+ strncmp((char*)sb+52, "ReIsEr2Fs",9)!=0)
return 0;
fprintf(stderr, Name ": %s appears to contain a reiserfs file system\n",name);
size = sb[0]|(sb[1]|(sb[2]|sb[3]<<8)<<8)<<8;