CVS patchset: 2588
CVS date: 1998/12/05 19:18:43
This commit is contained in:
jbj 1998-12-05 19:18:43 +00:00
parent 9702a4c8c6
commit c36ca7c15b
3 changed files with 5 additions and 5 deletions

View File

@ -735,7 +735,7 @@ static int writeFile(CFD_t *cfd, struct stat sb, struct cpioFileMapping * map,
num = strlen(map->archivePath) + 1; SET_NUM_FIELD(hdr.namesize, num, buf);
memcpy(hdr.checksum, "00000000", 8);
if ((rc = safewrite(cfd, &hdr, PHYS_HDR_SIZE) != PHYS_HDR_SIZE)
if ((rc = safewrite(cfd, &hdr, PHYS_HDR_SIZE)) != PHYS_HDR_SIZE)
return rc;
if ((rc = safewrite(cfd, map->archivePath, num)) != num)
return rc;
@ -920,11 +920,11 @@ int cpioBuildArchive(CFD_t *cfd, struct cpioFileMapping * mappings,
totalsize += size;
}
memset(&hdr, '0', PHYS_HDR_SIZE)
memset(&hdr, '0', PHYS_HDR_SIZE);
memcpy(hdr.magic, CPIO_NEWC_MAGIC, sizeof(hdr.magic));
memcpy(hdr.nlink, "00000001", 8);
memcpy(hdr.namesize, "0000000b", 8);
if ((rc = safewrite(cfd, &hdr, PHYS_HDR_SIZE) != PHYS_HDR_SIZE)
if ((rc = safewrite(cfd, &hdr, PHYS_HDR_SIZE)) != PHYS_HDR_SIZE)
return rc;
if ((rc = safewrite(cfd, "TRAILER!!!", 11)) != 11)
return rc;

View File

@ -93,7 +93,7 @@ int rpmdbRebuild(char * rootdir) {
return 1;
}
if (rmdir(newdbpath))
rpmMessage(RPMESS_ERROR, _("failed to remove directory %s: %s\n"),
rpmMessage(RPMMESS_ERROR, _("failed to remove directory %s: %s\n"),
newdbpath, strerror(errno));
}

2
url.h
View File

@ -30,7 +30,7 @@ extern "C" {
#endif
urltype urlIsURL(const char * url);
int rlSplit(const char *url, urlinfo **u);
int urlSplit(const char *url, urlinfo **u);
urlinfo *newUrlinfo(void);
void freeUrlinfo(urlinfo *u);