Bit fields are safer and more readable.
{
exfat_get_name(node, entry_path + path_length + 1);
exfat_debug("%s: %s, %"PRIu64" bytes, cluster %u", entry_path,
- IS_CONTIGUOUS(*node) ? "contiguous" : "fragmented",
+ node->is_contiguous ? "contiguous" : "fragmented",
node->size, node->start_cluster);
if (node->flags & EXFAT_ATTRIB_DIR)
{
{
exfat_get_name(node, name);
exfat_debug("[%s] %s: %s, %"PRId64" bytes, cluster 0x%x", __func__,
- name, IS_CONTIGUOUS(*node) ? "contiguous" : "fragmented",
+ name, node->is_contiguous ? "contiguous" : "fragmented",
node->size, node->start_cluster);
filler(buffer, name, NULL, 0);
exfat_put_node(&ef, node);
if (cluster < EXFAT_FIRST_DATA_CLUSTER)
exfat_bug("bad cluster 0x%x", cluster);
- if (IS_CONTIGUOUS(*node))
+ if (node->is_contiguous)
return cluster + 1;
fat_offset = s2o(ef, le32_to_cpu(ef->sb->fat_sector_start))
+ cluster * sizeof(cluster_t);
node->fptr_cluster = node->start_cluster = previous;
allocated = 1;
/* file consists of only one cluster, so it's contiguous */
- node->flags |= EXFAT_ATTRIB_CONTIGUOUS;
+ node->is_contiguous = true;
}
while (allocated < difference)
shrink_file(ef, node, current + allocated, allocated);
return -ENOSPC;
}
- if (next != previous - 1 && IS_CONTIGUOUS(*node))
+ if (next != previous - 1 && node->is_contiguous)
{
/* it's a pity, but we are not able to keep the file contiguous
anymore */
if (!make_noncontiguous(ef, node->start_cluster, previous))
return -EIO;
- node->flags &= ~EXFAT_ATTRIB_CONTIGUOUS;
- node->flags |= EXFAT_ATTRIB_DIRTY;
+ node->is_contiguous = false;
+ node->is_dirty = true;
}
- if (!set_next_cluster(ef, IS_CONTIGUOUS(*node), previous, next))
+ if (!set_next_cluster(ef, node->is_contiguous, previous, next))
return -EIO;
previous = next;
allocated++;
}
- if (!set_next_cluster(ef, IS_CONTIGUOUS(*node), previous,
+ if (!set_next_cluster(ef, node->is_contiguous, previous,
EXFAT_CLUSTER_END))
return -EIO;
return 0;
return -EIO;
}
previous = exfat_next_cluster(ef, node, last);
- if (!set_next_cluster(ef, IS_CONTIGUOUS(*node), last,
+ if (!set_next_cluster(ef, node->is_contiguous, last,
EXFAT_CLUSTER_END))
return -EIO;
}
{
previous = node->start_cluster;
node->start_cluster = EXFAT_CLUSTER_FREE;
- node->flags |= EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = true;
}
node->fptr_index = 0;
node->fptr_cluster = node->start_cluster;
return -EIO;
}
next = exfat_next_cluster(ef, node, previous);
- if (!set_next_cluster(ef, IS_CONTIGUOUS(*node), previous,
+ if (!set_next_cluster(ef, node->is_contiguous, previous,
EXFAT_CLUSTER_FREE))
return -EIO;
free_cluster(ef, previous);
exfat_update_mtime(node);
node->size = size;
- node->flags |= EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = true;
return 0;
}
#define EXFAT_UTF8_NAME_BUFFER_MAX (EXFAT_NAME_MAX * 3 + 1)
#define EXFAT_UTF8_ENAME_BUFFER_MAX (EXFAT_ENAME_MAX * 3 + 1)
-#define EXFAT_ATTRIB_CONTIGUOUS 0x10000
-#define EXFAT_ATTRIB_CACHED 0x20000
-#define EXFAT_ATTRIB_DIRTY 0x40000
-#define EXFAT_ATTRIB_UNLINKED 0x80000
-#define IS_CONTIGUOUS(node) (((node).flags & EXFAT_ATTRIB_CONTIGUOUS) != 0)
#define SECTOR_SIZE(sb) (1 << (sb).sector_bits)
#define CLUSTER_SIZE(sb) (SECTOR_SIZE(sb) << (sb).spc_bits)
#define CLUSTER_INVALID(c) \
off_t entry_offset;
cluster_t start_cluster;
int flags;
+ bool is_contiguous : 1;
+ bool is_cached : 1;
+ bool is_dirty : 1;
+ bool is_unlinked : 1;
uint64_t size;
time_t mtime, atime;
le16_t name[EXFAT_NAME_MAX + 1];
}
else if (node->references == 0 && node != ef->root)
{
- if (node->flags & EXFAT_ATTRIB_DIRTY)
+ if (node->is_dirty)
{
exfat_get_name(node, buffer);
exfat_warn("dirty node '%s' with zero references", buffer);
exfat_bug("unable to cleanup a node with %d references",
node->references);
- if (node->flags & EXFAT_ATTRIB_UNLINKED)
+ if (node->is_unlinked)
{
/* free all clusters and node structure itself */
rc = exfat_truncate(ef, node, 0, true);
node->size = le64_to_cpu(meta2->size);
node->start_cluster = le32_to_cpu(meta2->start_cluster);
node->fptr_cluster = node->start_cluster;
- if (meta2->flags & EXFAT_FLAG_CONTIGUOUS)
- node->flags |= EXFAT_ATTRIB_CONTIGUOUS;
+ node->is_contiguous = ((meta2->flags & EXFAT_FLAG_CONTIGUOUS) != 0);
}
static const struct exfat_entry* get_entry_ptr(const struct exfat* ef,
}
/* Empty file or directory must be marked as non-contiguous. */
- if (node->size == 0 && (node->flags & EXFAT_ATTRIB_CONTIGUOUS))
+ if (node->size == 0 && node->is_contiguous)
{
exfat_get_name(node, buffer);
exfat_error("'%s' is empty but marked as contiguous (%#x)", buffer,
struct exfat_node* node;
struct exfat_node* current = NULL;
- if (dir->flags & EXFAT_ATTRIB_CACHED)
+ if (dir->is_cached)
return 0; /* already cached */
rc = opendir(ef, dir, &it);
return rc;
}
- dir->flags |= EXFAT_ATTRIB_CACHED;
+ dir->is_cached = true;
return 0;
}
tree_detach(p);
free(p);
}
- node->flags &= ~EXFAT_ATTRIB_CACHED;
+ node->is_cached = false;
if (node->references != 0)
{
exfat_get_name(node, buffer);
exfat_warn("non-zero reference counter (%d) for '%s'",
node->references, buffer);
}
- if (node != ef->root && (node->flags & EXFAT_ATTRIB_DIRTY))
+ if (node != ef->root && node->is_dirty)
{
exfat_get_name(node, buffer);
exfat_bug("node '%s' is dirty", buffer);
struct exfat_entry_meta1 meta1;
struct exfat_entry_meta2 meta2;
- if (!(node->flags & EXFAT_ATTRIB_DIRTY))
+ if (!node->is_dirty)
return 0; /* no need to flush */
if (ef->ro)
meta2.start_cluster = cpu_to_le32(node->start_cluster);
meta2.flags = EXFAT_FLAG_ALWAYS1;
/* empty files must not be marked as contiguous */
- if (node->size != 0 && IS_CONTIGUOUS(*node))
+ if (node->size != 0 && node->is_contiguous)
meta2.flags |= EXFAT_FLAG_CONTIGUOUS;
/* name hash remains unchanged, no need to recalculate it */
return -EIO;
}
- node->flags &= ~EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = false;
return exfat_flush(ef);
}
if (!(dir->flags & EXFAT_ATTRIB_DIR))
exfat_bug("attempted to shrink a file");
- if (!(dir->flags & EXFAT_ATTRIB_CACHED))
+ if (!dir->is_cached)
exfat_bug("attempted to shrink uncached directory");
for (last_node = node = dir->child; node; node = node->next)
exfat_update_mtime(parent);
tree_detach(node);
rc = shrink_directory(ef, parent, deleted_offset);
- node->flags |= EXFAT_ATTRIB_UNLINKED;
+ node->is_unlinked = true;
if (rc != 0)
{
exfat_flush_node(ef, parent);
{
node->atime = tv[0].tv_sec;
node->mtime = tv[1].tv_sec;
- node->flags |= EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = true;
}
void exfat_update_atime(struct exfat_node* node)
{
node->atime = time(NULL);
- node->flags |= EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = true;
}
void exfat_update_mtime(struct exfat_node* node)
{
node->mtime = time(NULL);
- node->flags |= EXFAT_ATTRIB_DIRTY;
+ node->is_dirty = true;
}
const char* exfat_get_label(struct exfat* ef)