aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-06-23 17:30:18 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2019-06-23 17:30:18 +0200
commita94d6f47b0075f88682b97a7528be61980994fcb (patch)
treee0980dbf5b48b83a572129f6f8d5b2ad27c25eeb
parent167494d209920330c835febf75135b1ebecb441e (diff)
Split up fstree_add_xattr
This IMO makes it somewhat easier to read and understand what's going on. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
-rw-r--r--lib/fstree/xattr.c88
1 files changed, 42 insertions, 46 deletions
diff --git a/lib/fstree/xattr.c b/lib/fstree/xattr.c
index 916ab6e..cc84cea 100644
--- a/lib/fstree/xattr.c
+++ b/lib/fstree/xattr.c
@@ -5,11 +5,43 @@
#include <string.h>
#include <stdio.h>
+static void remove_from_list(fstree_t *fs, tree_xattr_t *xattr)
+{
+ tree_xattr_t *prev = NULL, *it = fs->xattr;
+
+ while (it != xattr) {
+ prev = it;
+ it = it->next;
+ }
+
+ if (prev == NULL) {
+ fs->xattr = xattr->next;
+ } else {
+ prev->next = xattr->next;
+ }
+}
+
+static tree_xattr_t *grow_xattr_block(tree_xattr_t *xattr)
+{
+ size_t count = (xattr == NULL) ? 4 : (xattr->max_attr * 2);
+ void *new = realloc(xattr, sizeof(*xattr) + sizeof(uint64_t) * count);
+
+ if (new == NULL) {
+ perror("adding extended attributes");
+ free(xattr);
+ return NULL;
+ }
+
+ xattr = new;
+ xattr->max_attr = count;
+ return xattr;
+}
+
int fstree_add_xattr(fstree_t *fs, tree_node_t *node,
const char *key, const char *value)
{
- tree_xattr_t *xattr, *prev, *it;
size_t key_idx, value_idx;
+ tree_xattr_t *xattr;
if (str_table_get_index(&fs->xattr_keys, key, &key_idx))
return -1;
@@ -29,56 +61,20 @@ int fstree_add_xattr(fstree_t *fs, tree_node_t *node,
}
}
- if (node->xattr == NULL) {
- xattr = calloc(1, sizeof(*xattr) + sizeof(uint64_t) * 4);
- if (xattr == NULL) {
- perror("adding extended attributes");
+ xattr = node->xattr;
+
+ if (xattr == NULL || xattr->max_attr == xattr->num_attr) {
+ if (xattr != NULL)
+ remove_from_list(fs, xattr);
+
+ xattr = grow_xattr_block(xattr);
+ if (xattr == NULL)
return -1;
- }
- xattr->max_attr = 4;
+ node->xattr = xattr;
xattr->owner = node;
-
xattr->next = fs->xattr;
fs->xattr = xattr;
-
- node->xattr = xattr;
- } else {
- xattr = node->xattr;
-
- if (xattr->max_attr == xattr->num_attr) {
- prev = NULL;
- it = fs->xattr;
-
- while (it != xattr) {
- prev = it;
- it = it->next;
- }
-
- if (prev == NULL) {
- fs->xattr = xattr->next;
- } else {
- prev->next = xattr->next;
- }
-
- node->xattr = NULL;
-
- it = realloc(xattr, sizeof(*xattr) +
- sizeof(uint64_t) * xattr->max_attr * 2);
-
- if (it == NULL) {
- perror("adding extended attributes");
- free(xattr);
- return -1;
- }
-
- xattr = it;
- xattr->max_attr *= 2;
-
- node->xattr = xattr;
- xattr->next = fs->xattr;
- fs->xattr = xattr;
- }
}
xattr->ref[xattr->num_attr] = (uint64_t)key_idx << 32;