Index: uspace/srv/fs/exfat/exfat.h =================================================================== --- uspace/srv/fs/exfat/exfat.h (revision abb7491c1e50240dca865ddc6c8cf97ef8947f33) +++ uspace/srv/fs/exfat/exfat.h (revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b) @@ -51,6 +51,6 @@ #define BPS(bs) ((uint32_t) (1 << (bs->bytes_per_sector))) -#define SPC(bs) ((uint32_t)(1 << (bs->sec_per_cluster))) -#define BPC(bs) ((uint32_t)(BPS(bs)*SPC(bs))) +#define SPC(bs) ((uint32_t) (1 << (bs->sec_per_cluster))) +#define BPC(bs) ((uint32_t) (BPS(bs) * SPC(bs))) #define VOL_FS(bs) uint64_t_le2host(bs->volume_start) #define VOL_CNT(bs) uint64_t_le2host(bs->volume_count) @@ -58,7 +58,7 @@ #define FAT_CNT(bs) uint32_t_le2host(bs->fat_sector_count) #define DATA_FS(bs) uint32_t_le2host(bs->data_start_sector) -#define DATA_CNT(bs) uint32_t_le2host(bs->data_clusters) +#define DATA_CNT(bs) uint32_t_le2host(bs->data_clusters) #define ROOT_FC(bs) uint32_t_le2host(bs->rootdir_cluster) -#define VOL_FLAGS(bs) uint16_t_le2host(bs->volume_flags) +#define VOL_FLAGS(bs) uint16_t_le2host(bs->volume_flags) #define EXFAT_NODE(node) ((node) ? (exfat_node_t *) (node)->data : NULL) @@ -181,6 +181,5 @@ extern void exfat_idx_fini_by_service_id(service_id_t); -extern int exfat_node_expand(service_id_t service_id, exfat_node_t *nodep, - exfat_cluster_t clusters); +extern int exfat_node_expand(service_id_t, exfat_node_t *, exfat_cluster_t); extern int exfat_node_put(fs_node_t *); extern int exfat_bitmap_get(fs_node_t **, service_id_t); Index: uspace/srv/fs/exfat/exfat_bitmap.c =================================================================== --- uspace/srv/fs/exfat/exfat_bitmap.c (revision abb7491c1e50240dca865ddc6c8cf97ef8947f33) +++ uspace/srv/fs/exfat/exfat_bitmap.c (revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b) @@ -53,5 +53,5 @@ { fs_node_t *fn; - block_t *b=NULL; + block_t *b = NULL; exfat_node_t *bitmapp; uint8_t *bitmap; @@ -94,5 +94,5 @@ { fs_node_t *fn; - block_t *b=NULL; + block_t *b = NULL; exfat_node_t *bitmapp; uint8_t *bitmap; @@ -129,5 +129,5 @@ { fs_node_t *fn; - block_t *b=NULL; + block_t *b = NULL; exfat_node_t *bitmapp; uint8_t *bitmap; @@ -142,5 +142,6 @@ aoff64_t offset = clst / 8; - rc = exfat_block_get(&b, bs, bitmapp, offset / BPS(bs), BLOCK_FLAGS_NONE); + rc = exfat_block_get(&b, bs, bitmapp, offset / BPS(bs), + BLOCK_FLAGS_NONE); if (rc != EOK) { (void) exfat_node_put(fn); @@ -167,9 +168,10 @@ clst = firstc; - while (clst < firstc+count ) { + while (clst < firstc + count ) { rc = bitmap_set_cluster(bs, service_id, clst); if (rc != EOK) { - if ((clst-firstc) > 0) - (void) bitmap_clear_clusters(bs, service_id, firstc, clst-firstc); + if (clst - firstc > 0) + (void) bitmap_clear_clusters(bs, service_id, + firstc, clst - firstc); return rc; } @@ -186,5 +188,5 @@ clst = firstc; - while (clst < firstc+count ) { + while (clst < firstc + count) { rc = bitmap_clear_cluster(bs, service_id, clst); if (rc != EOK) @@ -201,12 +203,11 @@ startc = EXFAT_CLST_FIRST; - while (startc < DATA_CNT(bs)+2) { + while (startc < DATA_CNT(bs) + 2) { endc = startc; while (bitmap_is_free(bs, service_id, endc) == EOK) { - if ((endc - startc)+1 == count){ + if ((endc - startc) + 1 == count) { *firstc = startc; return bitmap_set_clusters(bs, service_id, startc, count); - } - else + } else endc++; } @@ -227,11 +228,10 @@ lastc = nodep->firstc + ROUND_UP(nodep->size, BPC(bs)) / BPC(bs) - 1; - clst = lastc+1; + clst = lastc + 1; while (bitmap_is_free(bs, nodep->idx->service_id, clst) == EOK) { - if ((clst - lastc) == count){ + if (clst - lastc == count){ return bitmap_set_clusters(bs, nodep->idx->service_id, - lastc+1, count); - } - else + lastc + 1, count); + } else clst++; } @@ -248,5 +248,5 @@ lastc -= count; - return bitmap_clear_clusters(bs, nodep->idx->service_id, lastc+1, count); + return bitmap_clear_clusters(bs, nodep->idx->service_id, lastc + 1, count); } @@ -260,5 +260,5 @@ for (clst = nodep->firstc; clst < lastc; clst++) { - rc = exfat_set_cluster(bs, service_id, clst, clst+1); + rc = exfat_set_cluster(bs, service_id, clst, clst + 1); if (rc != EOK) return rc; Index: uspace/srv/fs/exfat/exfat_bitmap.h =================================================================== --- uspace/srv/fs/exfat/exfat_bitmap.h (revision abb7491c1e50240dca865ddc6c8cf97ef8947f33) +++ uspace/srv/fs/exfat/exfat_bitmap.h (revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b) @@ -42,23 +42,21 @@ struct exfat_bs; -extern int bitmap_alloc_clusters(struct exfat_bs *bs, service_id_t service_id, - exfat_cluster_t *firstc, exfat_cluster_t count); -extern int bitmap_append_clusters(struct exfat_bs *bs, struct exfat_node *nodep, - exfat_cluster_t count); -extern int bitmap_free_clusters(struct exfat_bs *bs, struct exfat_node *nodep, - exfat_cluster_t count); -extern int bitmap_replicate_clusters(struct exfat_bs *bs, struct exfat_node *nodep); +extern int bitmap_alloc_clusters(struct exfat_bs *, service_id_t, + exfat_cluster_t *, exfat_cluster_t); +extern int bitmap_append_clusters(struct exfat_bs *, struct exfat_node *, + exfat_cluster_t); +extern int bitmap_free_clusters(struct exfat_bs *, struct exfat_node *, + exfat_cluster_t); +extern int bitmap_replicate_clusters(struct exfat_bs *, struct exfat_node *); -extern int bitmap_is_free(struct exfat_bs *bs, service_id_t service_id, - exfat_cluster_t clst); -extern int bitmap_set_cluster(struct exfat_bs *bs, service_id_t service_id, - exfat_cluster_t clst); -extern int bitmap_clear_cluster(struct exfat_bs *bs, service_id_t service_id, - exfat_cluster_t clst); +extern int bitmap_is_free(struct exfat_bs *, service_id_t, exfat_cluster_t); +extern int bitmap_set_cluster(struct exfat_bs *, service_id_t, exfat_cluster_t); +extern int bitmap_clear_cluster(struct exfat_bs *, service_id_t, + exfat_cluster_t); -extern int bitmap_set_clusters(struct exfat_bs *bs, service_id_t service_id, - exfat_cluster_t firstc, exfat_cluster_t count); -extern int bitmap_clear_clusters(struct exfat_bs *bs, service_id_t service_id, - exfat_cluster_t firstc, exfat_cluster_t count); +extern int bitmap_set_clusters(struct exfat_bs *, service_id_t, + exfat_cluster_t, exfat_cluster_t); +extern int bitmap_clear_clusters(struct exfat_bs *, service_id_t, + exfat_cluster_t, exfat_cluster_t); Index: uspace/srv/fs/exfat/exfat_dentry.c =================================================================== --- uspace/srv/fs/exfat/exfat_dentry.c (revision abb7491c1e50240dca865ddc6c8cf97ef8947f33) +++ uspace/srv/fs/exfat/exfat_dentry.c (revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b) @@ -90,6 +90,6 @@ void exfat_dentry_get_name(const exfat_name_dentry_t *name, size_t size, uint16_t *dst, size_t *offset) { - size_t i=0; - while(iname[i]); i++; Index: uspace/srv/fs/exfat/exfat_dentry.h =================================================================== --- uspace/srv/fs/exfat/exfat_dentry.h (revision abb7491c1e50240dca865ddc6c8cf97ef8947f33) +++ uspace/srv/fs/exfat/exfat_dentry.h (revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b) @@ -149,17 +149,16 @@ -extern exfat_dentry_clsf_t exfat_classify_dentry(const exfat_dentry_t *d); +extern exfat_dentry_clsf_t exfat_classify_dentry(const exfat_dentry_t *); -extern uint16_t exfat_name_hash(const uint16_t *name, const uint16_t *uctable, - size_t chars); +extern uint16_t exfat_name_hash(const uint16_t *, const uint16_t *, size_t); -extern void exfat_dentry_get_name(const exfat_name_dentry_t *name, size_t size, - uint16_t *dst, size_t *offset); +extern void exfat_dentry_get_name(const exfat_name_dentry_t *, size_t, + uint16_t *, size_t *); -extern bool exfat_valid_char(wchar_t ch); -extern bool exfat_valid_name(const char *name); +extern bool exfat_valid_char(wchar_t); +extern bool exfat_valid_name(const char *); -extern size_t utf16_length(const uint16_t *wstr); +extern size_t utf16_length(const uint16_t *); Index: uspace/srv/fs/exfat/exfat_directory.c =================================================================== --- uspace/srv/fs/exfat/exfat_directory.c (revision abb7491c1e50240dca865ddc6c8cf97ef8947f33) +++ uspace/srv/fs/exfat/exfat_directory.c (revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b) @@ -72,5 +72,5 @@ di->bs = block_bb_get(di->service_id); /* di->blocks = nodep->size / BPS(di->bs); */ - di->blocks = ROUND_UP(nodep->size, BPS(di->bs))/BPS(di->bs); + di->blocks = ROUND_UP(nodep->size, BPS(di->bs)) / BPS(di->bs); return EOK; } @@ -90,5 +90,5 @@ int exfat_directory_close(exfat_directory_t *di) { - int rc=EOK; + int rc = EOK; if (di->b) @@ -113,8 +113,10 @@ if (!di->b) { if (di->nodep) { - rc = exfat_block_get(&di->b, di->bs, di->nodep, i, BLOCK_FLAGS_NONE); + rc = exfat_block_get(&di->b, di->bs, di->nodep, i, + BLOCK_FLAGS_NONE); } else { - rc = exfat_block_get_by_clst(&di->b, di->bs, di->service_id, - di->fragmented, di->firstc, NULL, i, BLOCK_FLAGS_NONE); + rc = exfat_block_get_by_clst(&di->b, di->bs, + di->service_id, di->fragmented, di->firstc, NULL, i, + BLOCK_FLAGS_NONE); } if (rc != EOK) { @@ -133,5 +135,5 @@ di->pos += 1; rc = exfat_directory_block_load(di); - if (rc!=EOK) + if (rc != EOK) di->pos -= 1; @@ -141,5 +143,5 @@ int exfat_directory_prev(exfat_directory_t *di) { - int rc=EOK; + int rc = EOK; if (di->pos > 0) { @@ -163,5 +165,5 @@ di->pos = pos; rc = exfat_directory_block_load(di); - if (rc!=EOK) + if (rc != EOK) di->pos = _pos; @@ -182,5 +184,6 @@ } -int exfat_directory_find(exfat_directory_t *di, exfat_dentry_clsf_t type, exfat_dentry_t **d) +int exfat_directory_find(exfat_directory_t *di, exfat_dentry_clsf_t type, + exfat_dentry_t **d) { do { @@ -195,5 +198,7 @@ } -int exfat_directory_find_continue(exfat_directory_t *di, exfat_dentry_clsf_t type, exfat_dentry_t **d) +int +exfat_directory_find_continue(exfat_directory_t *di, exfat_dentry_clsf_t type, + exfat_dentry_t **d) { int rc; @@ -208,5 +213,5 @@ exfat_file_dentry_t *df, exfat_stream_dentry_t *ds) { - uint16_t wname[EXFAT_FILENAME_LEN+1]; + uint16_t wname[EXFAT_FILENAME_LEN + 1]; exfat_dentry_t *d = NULL; int rc, i; @@ -233,5 +238,5 @@ return EOVERFLOW; - for (i=0; icount-1; i++) { + for (i = 0; i < df->count - 1; i++) { rc = exfat_directory_next(di); if (rc != EOK) @@ -269,5 +274,5 @@ { int rc, i, count; - exfat_dentry_t *array=NULL, *de; + exfat_dentry_t *array = NULL, *de; aoff64_t pos = di->pos; @@ -275,9 +280,9 @@ if (rc != EOK) return rc; - count = de->file.count+1; + count = de->file.count + 1; array = (exfat_dentry_t *) malloc(count*sizeof(exfat_dentry_t)); if (!array) return ENOMEM; - for (i=0; idata_size); array[0].file.checksum = host2uint16_t_le(exfat_directory_set_checksum((uint8_t *)array, - count*sizeof(exfat_dentry_t))); + count * sizeof(exfat_dentry_t))); /* Store */ - for (i=0; ib->dirty = true; rc = exfat_directory_next(di); - if (rc!=EOK) { + if (rc != EOK) { free(array); return rc; @@ -329,5 +334,5 @@ uint16_t *uctable; exfat_dentry_t df, ds, *de; - uint16_t wname[EXFAT_FILENAME_LEN+1]; + uint16_t wname[EXFAT_FILENAME_LEN + 1]; int rc, i; size_t uctable_chars, j; @@ -399,14 +404,14 @@ uint16_t *sname = wname; - for (i=0; itype = EXFAT_TYPE_NAME; /* test */ - for (j=0; jname.name[j] = *sname; sname++; @@ -434,5 +439,5 @@ if (rc != EOK) return rc; - count = de->file.count+1; + count = de->file.count + 1; while (count) { @@ -440,9 +445,9 @@ if (rc != EOK) return rc; - de->type &= (~EXFAT_TYPE_USED); + de->type &= ~EXFAT_TYPE_USED; di->b->dirty = true; rc = exfat_directory_next(di); - if (rc!=EOK) + if (rc != EOK) return rc; count--; @@ -489,5 +494,6 @@ case EXFAT_DENTRY_LAST: case EXFAT_DENTRY_FREE: - if (found==0) pos = di->pos; + if (found == 0) + pos = di->pos; found++; if (found == count) { Index: uspace/srv/fs/exfat/exfat_directory.h =================================================================== --- uspace/srv/fs/exfat/exfat_directory.h (revision abb7491c1e50240dca865ddc6c8cf97ef8947f33) +++ uspace/srv/fs/exfat/exfat_directory.h (revision ff0c270eaae7fb0bcea1e0d39986792efa5d9d5b) @@ -54,29 +54,29 @@ -extern void exfat_directory_init(exfat_directory_t *di); -extern int exfat_directory_open(exfat_node_t *nodep, exfat_directory_t *di); -extern int exfat_directory_open_parent(exfat_directory_t *di, - service_id_t service_id, exfat_cluster_t firstc, bool fragmented); -extern int exfat_directory_close(exfat_directory_t *di); +extern void exfat_directory_init(exfat_directory_t *); +extern int exfat_directory_open(exfat_node_t *, exfat_directory_t *); +extern int exfat_directory_open_parent(exfat_directory_t *, service_id_t, + exfat_cluster_t, bool); +extern int exfat_directory_close(exfat_directory_t *); -extern int exfat_directory_next(exfat_directory_t *di); -extern int exfat_directory_prev(exfat_directory_t *di); -extern int exfat_directory_seek(exfat_directory_t *di, aoff64_t pos); -extern int exfat_directory_get(exfat_directory_t *di, exfat_dentry_t **de); -extern int exfat_directory_find(exfat_directory_t *di, - exfat_dentry_clsf_t type, exfat_dentry_t **d); -extern int exfat_directory_find_continue(exfat_directory_t *di, - exfat_dentry_clsf_t type, exfat_dentry_t **d); +extern int exfat_directory_next(exfat_directory_t *); +extern int exfat_directory_prev(exfat_directory_t *); +extern int exfat_directory_seek(exfat_directory_t *, aoff64_t); +extern int exfat_directory_get(exfat_directory_t *, exfat_dentry_t **); +extern int exfat_directory_find(exfat_directory_t *, exfat_dentry_clsf_t, + exfat_dentry_t **); +extern int exfat_directory_find_continue(exfat_directory_t *, + exfat_dentry_clsf_t, exfat_dentry_t **); -extern int exfat_directory_read_file(exfat_directory_t *di, char *name, - size_t size, exfat_file_dentry_t *df, exfat_stream_dentry_t *ds); -extern int exfat_directory_sync_file(exfat_directory_t *di, - exfat_file_dentry_t *df, exfat_stream_dentry_t *ds); -extern int exfat_directory_write_file(exfat_directory_t *di, const char *name); -extern int exfat_directory_erase_file(exfat_directory_t *di, aoff64_t pos); +extern int exfat_directory_read_file(exfat_directory_t *, char *, size_t, + exfat_file_dentry_t *, exfat_stream_dentry_t *); +extern int exfat_directory_sync_file(exfat_directory_t *, exfat_file_dentry_t *, + exfat_stream_dentry_t *); +extern int exfat_directory_write_file(exfat_directory_t *, const char *); +extern int exfat_directory_erase_file(exfat_directory_t *, aoff64_t); -extern int exfat_directory_expand(exfat_directory_t *di); -extern int exfat_directory_lookup_free(exfat_directory_t *di, size_t count); -extern int exfat_directory_print(exfat_directory_t *di); +extern int exfat_directory_expand(exfat_directory_t *); +extern int exfat_directory_lookup_free(exfat_directory_t *, size_t); +extern int exfat_directory_print(exfat_directory_t *);