projects
/
project
/
ubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
validate: support uci lists in cli client and use dt_parse() return value to decide...
[project/ubox.git]
/
libblkid-tiny
/
squashfs.c
diff --git
a/libblkid-tiny/squashfs.c
b/libblkid-tiny/squashfs.c
index
d2033b6
..
d04f0b1
100644
(file)
--- a/
libblkid-tiny/squashfs.c
+++ b/
libblkid-tiny/squashfs.c
@@
-16,7
+16,7
@@
#include "bitops.h" /* swab16() */
#include "superblocks.h"
#include "bitops.h" /* swab16() */
#include "superblocks.h"
-#include
"md5.h"
+#include
<libubox/md5.h>
struct squashfs_super_block {
uint32_t s_magic;
struct squashfs_super_block {
uint32_t s_magic;
@@
-43,7
+43,7
@@
struct squashfs_super_block {
static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
{
md5_ctx_t ctx = { 0 };
static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
{
md5_ctx_t ctx = { 0 };
- uint
8
_t md5[4];
+ uint
32
_t md5[4];
struct squashfs_super_block *sq;
sq = blkid_probe_get_sb(pr, mag, struct squashfs_super_block);
struct squashfs_super_block *sq;
sq = blkid_probe_get_sb(pr, mag, struct squashfs_super_block);
@@
-62,7
+62,7
@@
static int probe_squashfs(blkid_probe pr, const struct blkid_idmag *mag)
md5_begin(&ctx);
md5_hash(sq, sizeof(*sq), &ctx);
md5_end(&md5, &ctx);
md5_begin(&ctx);
md5_hash(sq, sizeof(*sq), &ctx);
md5_end(&md5, &ctx);
- blkid_probe_sprintf_uuid(pr, NULL, 4, "%0
2x%02x-%02x%02
x",
+ blkid_probe_sprintf_uuid(pr, NULL, 4, "%0
8x-%08x-%08x-%08
x",
md5[3], md5[2], md5[1], md5[0]);
return 0;
}
md5[3], md5[2], md5[1], md5[0]);
return 0;
}