summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-06-08 01:18:24 +0000
committerNeil Brown <neilb@suse.de>2005-06-08 01:18:24 +0000
commitc50a674f709edb57f7fd17102f7f63475d7b12e9 (patch)
tree99c714dcad0523dafa06575541e4e2d7f40e1d8e
parenta68aa90e8ce7a8fc713030fe6ed64cc049f5f6ac (diff)
downloadmdadm-c50a674f709edb57f7fd17102f7f63475d7b12e9.tar.gz
mdadm-c50a674f709edb57f7fd17102f7f63475d7b12e9.tar.xz
mdadm-c50a674f709edb57f7fd17102f7f63475d7b12e9.zip
Fix a few typecasts
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
-rw-r--r--ChangeLog1
-rw-r--r--util.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index dfa5f30..e618e72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Changes Prior to 1.12.0 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 d5e2910..2b7c0d8 100644
--- a/util.c
+++ b/util.c
@@ -329,8 +329,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;
@@ -512,7 +512,7 @@ unsigned long calc_sb_csum(mdp_super_t *super)
unsigned long long newcsum = 0;
unsigned long csum;
int i;
- unsigned int *superc = (int*) super;
+ unsigned int *superc = (unsigned int*) super;
super->sb_csum = 0;
for(i=0; i<MD_SB_BYTES/4; i++)