sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fprint.h: turned entry.dirName into flexible array

Browse Source
This commit is contained in:
Alexey Tourbin 2009-06-05 02:02:03 +04:00
parent d68195b463
commit c57d3c753b
2 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rpmdb/fprint.c
View File

@ -26,7 +26,7 @@ fingerPrintCache fpCacheCreate(unsigned int size)
fingerPrintCache fpCacheFree(fingerPrintCache cache)
{
/* don't free keys: key=dirname is part of value=entry, see below */
/* don't free keys: key=dirname is flexible member of value=entry */
cache->dn2de = htFree(cache->dn2de, NULL, _free);
cache = _free(cache);
return NULL;
@ -134,22 +134,16 @@ static fingerPrint doLookup(fingerPrintCache cache,
if (cacheHit != NULL) {
fp.entry = cacheHit;
} else if (!stat((*buf != '\0' ? buf : "/"), &sb)) {
/* single malloc for both key=dirname and value=entry */
size_t nb = sizeof(*fp.entry) + (*buf != '\0' ? (end-buf) : 1) + 1;
struct fprintCacheEntry_s *newEntry = xmalloc(nb);
/* dirName has a byte for terminating '\0' */
size_t nb = sizeof(*fp.entry) + (*buf != '\0' ? (end-buf) : 1);
struct fprintCacheEntry_s *de = xmalloc(nb);
/*@-usereleased@*/ /* LCL: contiguous malloc confusion */
char *dn = (char *)(newEntry + 1);
strcpy(dn, (*buf != '\0' ? buf : "/"));
newEntry->ino = sb.st_ino;
newEntry->dev = sb.st_dev;
newEntry->dirName = dn;
fp.entry = newEntry;
de->ino = sb.st_ino;
de->dev = sb.st_dev;
strcpy(de->dirName, (*buf != '\0' ? buf : "/"));
/*@-kepttrans -dependenttrans @*/
htAddEntry(cache->dn2de, dn, fp.entry);
/*@=kepttrans =dependenttrans @*/
/*@=usereleased@*/
htAddEntry(cache->dn2de, de->dirName, de);
fp.entry = de;
}
if (fp.entry) {

2
rpmdb/fprint.h
View File

@ -23,9 +23,9 @@ typedef struct fingerPrint_s fingerPrint;
* installs of a system w/o actually mounting filesystems.
*/
struct fprintCacheEntry_s {
const char * dirName; /*!< path to existing directory */
dev_t dev; /*!< stat(2) device number */
ino_t ino; /*!< stat(2) inode number */
char dirName[1]; /*!< path to existing directory */
};
/**