Continue refactor

This commit is contained in:
Nathan Fisher 2024-02-11 11:00:28 -05:00
parent 1e5b903cff
commit 4a2b0328f9
9 changed files with 783 additions and 781 deletions

1542
haggis.c

File diff suppressed because it is too large Load diff

View file

@ -45,11 +45,11 @@
int haggis_store_header (FILE *stream);
int haggis_check_header (FILE *stream);
void haggis_device_init (dev_t rdev, haggis_device *dev);
void haggis_device_init (haggis_device *self, dev_t rdev);
int haggis_store_device (haggis_device *self, FILE *stream);
int haggis_load_device (FILE *stream, haggis_device *dev);
int haggis_store_cksum (FILE *stream, haggis_checksum *cksum);
int haggis_load_cksum (FILE *stream, haggis_checksum *cksum);
int haggis_load_device (haggis_device *self, FILE *stream);
int haggis_store_cksum (haggis_checksum *self, FILE *stream);
int haggis_load_cksum (haggis_checksum *self, FILE *stream);
int validate_md5 (haggis_file *file);
int validate_sha1 (haggis_file *file);
int validate_sha256 (haggis_file *file);

View file

@ -8,7 +8,7 @@ int main() {
int ret;
f = fopen("output/device", "r");
ret = haggis_load_device(f, &dev);
ret = haggis_load_device(&dev, f);
fclose(f);
if (ret) return ret;
assert(dev.major.val == 42);

View file

@ -10,7 +10,7 @@ int main() {
int i, ret;
f = fopen("output/md5", "r");
if (haggis_load_cksum(f, &cksum)) return 1;
if (haggis_load_cksum(&cksum, f)) return 1;
assert(cksum.tag == md5);
for (i = 0; i < 16; i++) {
assert(cksum.md5[i] == (uint8_t)i);

View file

@ -10,7 +10,7 @@ int main() {
int i, ret;
f = fopen("output/sha1", "r");
if (haggis_load_cksum(f, &cksum)) return 1;
if (haggis_load_cksum(&cksum, f)) return 1;
assert(cksum.tag == sha1);
for (i = 0; i < 20; i++) {
assert(cksum.sha1[i] == (uint8_t)i);

View file

@ -10,7 +10,7 @@ int main() {
int i, ret;
f = fopen("output/sha256", "r");
if (haggis_load_cksum(f, &cksum)) return 1;
if (haggis_load_cksum(&cksum, f)) return 1;
assert(cksum.tag == sha256);
for (i = 0; i < 32; i++) {
assert(cksum.sha256[i] == (uint8_t)i);

View file

@ -13,7 +13,7 @@ int main() {
cksum.md5[i] = (uint8_t)i;
}
f = fopen("output/md5", "w");
ret = haggis_store_cksum(f, &cksum);
ret = haggis_store_cksum(&cksum, f);
fclose(f);
return ret;
}

View file

@ -13,7 +13,7 @@ int main() {
cksum.md5[i] = (uint8_t)i;
}
f = fopen("output/sha1", "w");
ret = haggis_store_cksum(f, &cksum);
ret = haggis_store_cksum(&cksum, f);
fclose(f);
return ret;
}

View file

@ -13,7 +13,7 @@ int main() {
cksum.sha256[i] = (uint8_t)i;
}
f = fopen("output/sha256", "w");
ret = haggis_store_cksum(f, &cksum);
ret = haggis_store_cksum(&cksum, f);
fclose(f);
return ret;
}