diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2009-03-19 10:15:49 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2009-04-03 13:59:45 +0300 |
| commit | f715286ceb64dbf0baaa66b2b96cc4c25714e55e (patch) | |
| tree | bf477de0387c048e03babdfbd114428fbca2617e | |
| parent | e84e0adc0ae5d9f99f39fad809c873249e3dc9fc (diff) | |
| download | rpm-f715286ceb64dbf0baaa66b2b96cc4c25714e55e.tar.gz rpm-f715286ceb64dbf0baaa66b2b96cc4c25714e55e.tar.bz2 rpm-f715286ceb64dbf0baaa66b2b96cc4c25714e55e.zip | |
Revert couple of checksum -> digest renames
- physical cpio header and elf header have checksums, not digests
(from commit 7acdfded4a82e86a673418c3953aa6bf8106d313)
- doesn't affect functionality though
(cherry picked from commit 298c919c00ffbc6ea988545092b02af5384bd7a4)
| -rw-r--r-- | lib/cpio.c | 2 | ||||
| -rw-r--r-- | lib/cpio.h | 2 | ||||
| -rw-r--r-- | tools/debugedit.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/cpio.c b/lib/cpio.c index df35dedfb..9003494b7 100644 --- a/lib/cpio.c +++ b/lib/cpio.c @@ -102,7 +102,7 @@ int cpioHeaderWrite(FSM_t fsm, struct stat * st) dev = minor(st->st_rdev); SET_NUM_FIELD(hdr->rdevMinor, dev, field); len = strlen(fsm->path) + 1; SET_NUM_FIELD(hdr->namesize, len, field); - memcpy(hdr->digest, "00000000", 8); + memcpy(hdr->checksum, "00000000", 8); memcpy(fsm->rdbuf + PHYS_HDR_SIZE, fsm->path, len); /* XXX DWRITE uses rdnb for I/O length. */ diff --git a/lib/cpio.h b/lib/cpio.h index d99e4123b..945318429 100644 --- a/lib/cpio.h +++ b/lib/cpio.h @@ -83,7 +83,7 @@ struct cpioCrcPhysicalHeader { char rdevMajor[8]; char rdevMinor[8]; char namesize[8]; - char digest[8]; /* ignored !! */ + char checksum[8]; /* ignored !! */ }; #define PHYS_HDR_SIZE 110 /* Don't depend on sizeof(struct) */ diff --git a/tools/debugedit.c b/tools/debugedit.c index dd307dd90..f42b34a2a 100644 --- a/tools/debugedit.c +++ b/tools/debugedit.c @@ -1396,7 +1396,7 @@ handle_build_id (DSO *dso, Elf_Data *build_id, if (elf64_xlatetom (&x, &x, dso->ehdr.e_ident[EI_DATA]) == NULL) { bad: - fprintf (stderr, "Failed to compute header digest: %s\n", + fprintf (stderr, "Failed to compute header checksum: %s\n", elf_errmsg (elf_errno ())); exit (1); } |