rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-25 18:40:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Store initial file path inline with struct snapraid_file

Browse source
This commit is contained in:
Andrea Mazzoleni 2026-10-03 17:12:44 +02:00
parent 9f24ca00d1
commit 143813a90e
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cmdline/elem.c
View file

@ -488,8 +488,10 @@ struct snapraid_file* file_alloc_len(unsigned block_size, const char* sub, size_
exit(EXIT_FAILURE);
}
file = malloc_nofail(sizeof(struct snapraid_file));
file->sub = strndup_nofail(sub, sub_len);
file = malloc_nofail(sizeof(struct snapraid_file) + sub_len + 1);
file->sub = file->sub_inline;
memcpy(file->sub, sub, sub_len);
file->sub[sub_len] = 0;
file->size = size;
file->blockmax = blockmax;
file->mtime_sec = mtime_sec;
@ -505,6 +507,7 @@ struct snapraid_file* file_dup(struct snapraid_file* copy)
{
struct snapraid_file* file;
block_off_t i;
size_t sub_len;
if (copy->blockmax > BLOCK_MAX) {
#if SIZE_MAX == UINT32_MAX
@ -515,8 +518,11 @@ struct snapraid_file* file_dup(struct snapraid_file* copy)
exit(EXIT_FAILURE);
}
file = malloc_nofail(sizeof(struct snapraid_file));
file->sub = strdup_nofail(copy->sub);
sub_len = strlen(copy->sub);
file = malloc_nofail(sizeof(struct snapraid_file) + sub_len + 1);
file->sub = file->sub_inline;
memcpy(file->sub, copy->sub, sub_len);
file->sub[sub_len] = 0;
file->size = copy->size;
file->blockmax = copy->blockmax;
file->mtime_sec = copy->mtime_sec;
@ -539,7 +545,8 @@ void file_free(void* void_file)
{
struct snapraid_file* file = void_file;
free(file->sub);
if (file->sub != file->sub_inline)
free(file->sub);
file->sub = 0;
free(file->blockvec);
file->blockvec = 0;
@ -548,7 +555,9 @@ void file_free(void* void_file)
void file_rename(struct snapraid_file* file, const char* sub)
{
free(file->sub);
if (file->sub != file->sub_inline)
free(file->sub);
file->sub = strdup_nofail(sub);
}

2
cmdline/elem.h
View file

@ -341,6 +341,8 @@ struct snapraid_file {
tommy_hashdyn_node nodeset;
tommy_hashdyn_node pathset;
tommy_hashdyn_node stampset;
char sub_inline[]; /**< Inline storage for the initial sub path. */
};
/**