Unified · Split
| @@ -72,13 +72,13 @@ void get_checksum2(char *buf,int len,char *sum) · 71 unmodified lines | |||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) { | 74 | for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) { |
| 75 | mdfour_update(&m, buf1+i, CSUM_CHUNK); | 75 | mdfour_update(&m, (uchar *)(buf1+i), CSUM_CHUNK); |
| 76 | } | 76 | } |
| 77 | if (len - i > 0) { | 77 | if (len - i > 0) { |
| 78 | mdfour_update(&m, buf1+i, (len-i)); | 78 | mdfour_update(&m, (uchar *)(buf1+i), (len-i)); |
| 79 | } | 79 | } |
| 80 | 80 | ||
| 81 | mdfour_result(&m, sum); | 81 | mdfour_result(&m, (uchar *)sum); |
| 82 | } | 82 | } |
| 83 | 83 | ||
| 84 | 84 | ||
| @@ -102,15 +102,15 @@ void file_checksum(char *fname,char *sum,OFF_T size) · 17 unmodified lines | |||
| 102 | 102 | ||
| 103 | for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) { | 103 | for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) { |
| 104 | memcpy(tmpchunk, map_ptr(buf,i,CSUM_CHUNK), CSUM_CHUNK); | 104 | memcpy(tmpchunk, map_ptr(buf,i,CSUM_CHUNK), CSUM_CHUNK); |
| 105 | mdfour_update(&m, tmpchunk, CSUM_CHUNK); | 105 | mdfour_update(&m, (uchar *)tmpchunk, CSUM_CHUNK); |
| 106 | } | 106 | } |
| 107 | 107 | ||
| 108 | if (len - i > 0) { | 108 | if (len - i > 0) { |
| 109 | memcpy(tmpchunk, map_ptr(buf,i,len-i), len-i); | 109 | memcpy(tmpchunk, map_ptr(buf,i,len-i), len-i); |
| 110 | mdfour_update(&m, tmpchunk, (len-i)); | 110 | mdfour_update(&m, (uchar *)tmpchunk, (len-i)); |
| 111 | } | 111 | } |
| 112 | 112 | ||
| 113 | mdfour_result(&m, sum); | 113 | mdfour_result(&m, (uchar *)sum); |
| 114 | 114 | ||
| 115 | close(fd); | 115 | close(fd); |
| 116 | unmap_file(buf); | 116 | unmap_file(buf); |
| @@ -152,14 +152,14 @@ void sum_update(char *p,int len) · 35 unmodified lines | |||
| 152 | if (sumresidue) { | 152 | if (sumresidue) { |
| 153 | i = MIN(CSUM_CHUNK-sumresidue,len); | 153 | i = MIN(CSUM_CHUNK-sumresidue,len); |
| 154 | memcpy(sumrbuf+sumresidue,p,i); | 154 | memcpy(sumrbuf+sumresidue,p,i); |
| 155 | mdfour_update(&md, sumrbuf, (i+sumresidue)); | 155 | mdfour_update(&md, (uchar *)sumrbuf, (i+sumresidue)); |
| 156 | len -= i; | 156 | len -= i; |
| 157 | p += i; | 157 | p += i; |
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) { | 160 | for(i = 0; i + CSUM_CHUNK <= len; i += CSUM_CHUNK) { |
| 161 | memcpy(sumrbuf,p+i,CSUM_CHUNK); | 161 | memcpy(sumrbuf,p+i,CSUM_CHUNK); |
| 162 | mdfour_update(&md, sumrbuf, CSUM_CHUNK); | 162 | mdfour_update(&md, (uchar *)sumrbuf, CSUM_CHUNK); |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | if (len - i > 0) { | 165 | if (len - i > 0) { |
| @@ -173,8 +173,8 @@ void sum_update(char *p,int len) · 7 unmodified lines | |||
| 173 | void sum_end(char *sum) | 173 | void sum_end(char *sum) |
| 174 | { | 174 | { |
| 175 | if (sumresidue) { | 175 | if (sumresidue) { |
| 176 | mdfour_update(&md, sumrbuf, sumresidue); | 176 | mdfour_update(&md, (uchar *)sumrbuf, sumresidue); |
| 177 | } | 177 | } |
| 178 | 178 | ||
| 179 | mdfour_result(&md, sum); | 179 | mdfour_result(&md, (uchar *)sum); |
| 180 | } | 180 | } |