Consistent naming: sq_* -> sqfs_*

vasi · May 30, 2014 · 75bca3b · 75bca3b
1 parent 10d3a72
commit 75bca3b
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 50 deletions.
diff --git a/common.h b/common.h
@@ -30,10 +30,10 @@
 #ifdef _WIN32
 	#include <win32.h>
 #else
-	typedef mode_t sq_mode_t;
-	typedef uid_t sq_id_t;
-	typedef off_t sq_off_t;
-	typedef int sq_fd_t;
+	typedef mode_t sqfs_mode_t;
+	typedef uid_t sqfs_id_t;
+	typedef off_t sqfs_off_t;
+	typedef int sqfs_fd_t;
 #endif
 
 #include <stdint.h>
@@ -61,7 +61,7 @@ typedef struct {
 } sqfs_block;
 
 typedef struct {
-	sq_off_t block;
+	sqfs_off_t block;
 	size_t offset;
 } sqfs_md_cursor;
 

diff --git a/dir.c b/dir.c
@@ -34,7 +34,7 @@ static sqfs_err sqfs_dir_md_read(sqfs_dir *dir, void *buf, size_t size) {
 	return sqfs_md_read(dir->fs, &dir->cur, buf, size);
 }
 
-static sq_off_t sqfs_dir_offset(const sqfs_dir *dir) {
+static sqfs_off_t sqfs_dir_offset(const sqfs_dir *dir) {
 	return dir->total - dir->remain;
 }
 
@@ -56,7 +56,7 @@ sqfs_err sqfs_opendir(sqfs *fs, sqfs_inode *inode, sqfs_dir *dir) {
 
 sqfs_dir_entry *sqfs_readdir(sqfs_dir *dir, sqfs_err *err) {
 	struct squashfs_dir_entry entry;
-	sq_off_t offset = -1;
+	sqfs_off_t offset = -1;
 
 	while (dir->header.count == 0) {
 		offset = sqfs_dir_offset(dir);
@@ -100,7 +100,7 @@ sqfs_dir_entry *sqfs_readdir(sqfs_dir *dir, sqfs_err *err) {
 /* Finds the next directory header for a given 'name', if non-null, or an
    'offset'. */
 static sqfs_err sqfs_dir_ff_header(sqfs_dir *dir, sqfs_inode *inode,
-		const char *name, size_t namesize, sq_off_t offset) {
+		const char *name, size_t namesize, sqfs_off_t offset) {
 	size_t skipped = 0;
 	sqfs_md_cursor cur = inode->next;
 	size_t count = inode->xtra.dir.idx_count;
@@ -138,7 +138,7 @@ static sqfs_err sqfs_dir_ff_header(sqfs_dir *dir, sqfs_inode *inode,
 	return SQFS_OK;
 }
 
-sqfs_err sqfs_dir_ff_offset(sqfs_dir *dir, sqfs_inode *inode, sq_off_t off,
+sqfs_err sqfs_dir_ff_offset(sqfs_dir *dir, sqfs_inode *inode, sqfs_off_t off,
 		bool *found) {
 	sqfs_err err;
 	sqfs_dir_entry *dentry;

diff --git a/dir.h b/dir.h
@@ -36,7 +36,7 @@ typedef struct {
 	sqfs_inode_num inode_number;
 	int type;
 	char *name;
-	sq_off_t offset, next_offset;
+	sqfs_off_t offset, next_offset;
 } sqfs_dir_entry;
 
 typedef struct {
@@ -54,7 +54,7 @@ sqfs_err sqfs_opendir(sqfs *fs, sqfs_inode *inode, sqfs_dir *dir);
 sqfs_dir_entry *sqfs_readdir(sqfs_dir *dir, sqfs_err *err);
 
 /* Fast forward in a directory to find a given file */
-sqfs_err sqfs_dir_ff_offset(sqfs_dir *dir, sqfs_inode *inode, sq_off_t off,
+sqfs_err sqfs_dir_ff_offset(sqfs_dir *dir, sqfs_inode *inode, sqfs_off_t off,
 	bool *found);
 
 /* For lookup name functions, returned entry will have no name field */

diff --git a/file.c b/file.c
@@ -110,11 +110,11 @@ sqfs_err sqfs_blocklist_next(sqfs_blocklist *bl) {
 	return SQFS_OK;
 }
 
-sqfs_err sqfs_read_range(sqfs *fs, sqfs_inode *inode, sq_off_t start,
-		sq_off_t *size, void *buf) {
+sqfs_err sqfs_read_range(sqfs *fs, sqfs_inode *inode, sqfs_off_t start,
+		sqfs_off_t *size, void *buf) {
 	sqfs_err err = SQFS_OK;
 
-	sq_off_t file_size;
+	sqfs_off_t file_size;
 	size_t block_size;
 	sqfs_blocklist bl;
 
@@ -251,7 +251,7 @@ sqfs_err sqfs_blockidx_add(sqfs *fs, sqfs_inode *inode,
 }
 
 sqfs_err sqfs_blockidx_blocklist(sqfs *fs, sqfs_inode *inode,
-		sqfs_blocklist *bl, sq_off_t start) {
+		sqfs_blocklist *bl, sqfs_off_t start) {
 	size_t block, metablock, skipped;
 	sqfs_blockidx_entry *blockidx, **bp;
 	sqfs_cache_idx idx;

diff --git a/file.h b/file.h
@@ -58,8 +58,8 @@ void sqfs_blocklist_init(sqfs *fs, sqfs_inode *inode, sqfs_blocklist *bl);
 sqfs_err sqfs_blocklist_next(sqfs_blocklist *bl);
 
 
-sqfs_err sqfs_read_range(sqfs *fs, sqfs_inode *inode, sq_off_t start,
-	sq_off_t *size, void *buf);
+sqfs_err sqfs_read_range(sqfs *fs, sqfs_inode *inode, sqfs_off_t start,
+	sqfs_off_t *size, void *buf);
 
 
 typedef struct {
@@ -74,6 +74,6 @@ sqfs_err sqfs_blockidx_add(sqfs *fs, sqfs_inode *inode,
 
 /* Get a blocklist fast-forwarded to the correct location */
 sqfs_err sqfs_blockidx_blocklist(sqfs *fs, sqfs_inode *inode,
-	sqfs_blocklist *bl, sq_off_t start);
+	sqfs_blocklist *bl, sqfs_off_t start);
 
 #endif
diff --git a/fs.c b/fs.c
@@ -51,7 +51,7 @@ sqfs_compression_type sqfs_compression(sqfs *fs) {
 	return fs->sb.compression;
 }
 
-sqfs_err sqfs_init(sqfs *fs, sq_fd_t fd) {
+sqfs_err sqfs_init(sqfs *fs, sqfs_fd_t fd) {
 	sqfs_err err = SQFS_OK;
 	memset(fs, 0, sizeof(*fs));
 
@@ -113,7 +113,7 @@ void sqfs_data_header(uint32_t hdr, bool *compressed, uint32_t *size) {
 	*size = hdr & ~SQUASHFS_COMPRESSED_BIT_BLOCK;
 }
 
-sqfs_err sqfs_block_read(sqfs *fs, sq_off_t pos, bool compressed,
+sqfs_err sqfs_block_read(sqfs *fs, sqfs_off_t pos, bool compressed,
 		uint32_t size, size_t outsize, sqfs_block **block) {
 	sqfs_err err = SQFS_ERR;
 	if (!(*block = malloc(sizeof(**block))))
@@ -149,7 +149,7 @@ sqfs_err sqfs_block_read(sqfs *fs, sq_off_t pos, bool compressed,
 	return err;
 }
 
-sqfs_err sqfs_md_block_read(sqfs *fs, sq_off_t pos, size_t *data_size,
+sqfs_err sqfs_md_block_read(sqfs *fs, sqfs_off_t pos, size_t *data_size,
 		sqfs_block **block) {
 	sqfs_err err = SQFS_OK;
 	uint16_t hdr;
@@ -172,7 +172,7 @@ sqfs_err sqfs_md_block_read(sqfs *fs, sq_off_t pos, size_t *data_size,
 	return err;
 }
 
-sqfs_err sqfs_data_block_read(sqfs *fs, sq_off_t pos, uint32_t hdr,
+sqfs_err sqfs_data_block_read(sqfs *fs, sqfs_off_t pos, uint32_t hdr,
 		sqfs_block **block) {
 	bool compressed;
 	uint32_t size;
@@ -181,7 +181,7 @@ sqfs_err sqfs_data_block_read(sqfs *fs, sq_off_t pos, uint32_t hdr,
 		fs->sb.block_size, block);
 }
 
-sqfs_err sqfs_md_cache(sqfs *fs, sq_off_t *pos, sqfs_block **block) {
+sqfs_err sqfs_md_cache(sqfs *fs, sqfs_off_t *pos, sqfs_block **block) {
 	sqfs_block_cache_entry *entry = sqfs_cache_get(
 		&fs->md_cache, *pos);
 	if (!entry) {
@@ -198,7 +198,7 @@ sqfs_err sqfs_md_cache(sqfs *fs, sq_off_t *pos, sqfs_block **block) {
 	return SQFS_OK;
 }
 
-sqfs_err sqfs_data_cache(sqfs *fs, sqfs_cache *cache, sq_off_t pos,
+sqfs_err sqfs_data_cache(sqfs *fs, sqfs_cache *cache, sqfs_off_t pos,
 		uint32_t hdr, sqfs_block **block) {
 	sqfs_block_cache_entry *entry = sqfs_cache_get(cache, pos);
 	if (!entry) {
@@ -218,13 +218,13 @@ void sqfs_block_dispose(sqfs_block *block) {
 	free(block);
 }
 
-void sqfs_md_cursor_inode(sqfs_md_cursor *cur, sqfs_inode_id id, sq_off_t base) {
+void sqfs_md_cursor_inode(sqfs_md_cursor *cur, sqfs_inode_id id, sqfs_off_t base) {
 	cur->block = (id >> 16) + base;
 	cur->offset = id & 0xffff;
 }
 
 sqfs_err sqfs_md_read(sqfs *fs, sqfs_md_cursor *cur, void *buf, size_t size) {
-	sq_off_t pos = cur->block;
+	sqfs_off_t pos = cur->block;
 	while (size > 0) {
 		sqfs_block *block;
 		size_t take;
@@ -258,13 +258,13 @@ size_t sqfs_divceil(uint64_t total, size_t group) {
 	return q;
 }
 
-sqfs_err sqfs_id_get(sqfs *fs, uint16_t idx, sq_id_t *id) {
+sqfs_err sqfs_id_get(sqfs *fs, uint16_t idx, sqfs_id_t *id) {
 	uint32_t rid;
 	sqfs_err err = sqfs_table_get(&fs->id_table, fs, idx, &rid);
 	if (err)
 		return err;
 	sqfs_swapin32(&rid);
-	*id = (sq_id_t)rid;
+	*id = (sqfs_id_t)rid;
 	return SQFS_OK;
 }
 

diff --git a/nonstd-pread.c b/nonstd-pread.c
@@ -30,7 +30,7 @@
 #ifdef _WIN32
 
 #include <win32.h>
-ssize_t sqfs_pread(HANDLE file, void *buf, size_t count, sq_off_t off) {
+ssize_t sqfs_pread(HANDLE file, void *buf, size_t count, sqfs_off_t off) {
 	DWORD bread;
 	OVERLAPPED ov = { 0 };
 	ov.Offset = (DWORD)off;
@@ -45,7 +45,7 @@ ssize_t sqfs_pread(HANDLE file, void *buf, size_t count, sq_off_t off) {
 
 #include <unistd.h>
 
-ssize_t sqfs_pread(sq_fd_t fd, void *buf, size_t count, sq_off_t off) {
+ssize_t sqfs_pread(sqfs_fd_t fd, void *buf, size_t count, sqfs_off_t off) {
 	return pread(fd, buf, count, off);
 }
 

diff --git a/nonstd-stat.c b/nonstd-stat.c
@@ -33,7 +33,7 @@
 #include "squashfs_fs.h"
 
 /* S_IF* are not standard */
-sq_mode_t sqfs_mode(int inode_type) {
+sqfs_mode_t sqfs_mode(int inode_type) {
 	switch (inode_type) {
 		case SQUASHFS_DIR_TYPE:
 		case SQUASHFS_LDIR_TYPE:

diff --git a/nonstd.h b/nonstd.h
@@ -29,7 +29,7 @@
 
 dev_t sqfs_makedev(int maj, int min);
 
-ssize_t sqfs_pread(sq_fd_t fd, void *buf, size_t count, sq_off_t off);
+ssize_t sqfs_pread(sqfs_fd_t fd, void *buf, size_t count, sqfs_off_t off);
 
 int sqfs_enoattr();
 

diff --git a/squashfuse.h b/squashfuse.h
@@ -39,7 +39,7 @@
 #include <stdbool.h>
 
 struct sqfs {
-	sq_fd_t fd;
+	sqfs_fd_t fd;
 	struct squashfs_super_block sb;
 	sqfs_table id_table;
 	sqfs_table frag_table;
@@ -90,7 +90,7 @@ void sqfs_version_supported(int *min_major, int *min_minor, int *max_major,
 size_t sqfs_divceil(uint64_t total, size_t group);
 
 
-sqfs_err sqfs_init(sqfs *fs, sq_fd_t fd);
+sqfs_err sqfs_init(sqfs *fs, sqfs_fd_t fd);
 void sqfs_destroy(sqfs *fs);
 
 /* Ok to call these even on incompletely constructed filesystems */
@@ -101,29 +101,29 @@ sqfs_compression_type sqfs_compression(sqfs *fs);
 void sqfs_md_header(uint16_t hdr, bool *compressed, uint16_t *size);
 void sqfs_data_header(uint32_t hdr, bool *compressed, uint32_t *size);
 
-sqfs_err sqfs_block_read(sqfs *fs, sq_off_t pos, bool compressed, uint32_t size,
+sqfs_err sqfs_block_read(sqfs *fs, sqfs_off_t pos, bool compressed, uint32_t size,
 	size_t outsize, sqfs_block **block);
 void sqfs_block_dispose(sqfs_block *block);
 
-sqfs_err sqfs_md_block_read(sqfs *fs, sq_off_t pos, size_t *data_size,
+sqfs_err sqfs_md_block_read(sqfs *fs, sqfs_off_t pos, size_t *data_size,
 	sqfs_block **block);
-sqfs_err sqfs_data_block_read(sqfs *fs, sq_off_t pos, uint32_t hdr,
+sqfs_err sqfs_data_block_read(sqfs *fs, sqfs_off_t pos, uint32_t hdr,
 	sqfs_block **block);
 
 /* Don't dispose after getting block, it's in the cache */
-sqfs_err sqfs_md_cache(sqfs *fs, sq_off_t *pos, sqfs_block **block);
-sqfs_err sqfs_data_cache(sqfs *fs, sqfs_cache *cache, sq_off_t pos,
+sqfs_err sqfs_md_cache(sqfs *fs, sqfs_off_t *pos, sqfs_block **block);
+sqfs_err sqfs_data_cache(sqfs *fs, sqfs_cache *cache, sqfs_off_t pos,
 	uint32_t hdr, sqfs_block **block);
 
-void sqfs_md_cursor_inode(sqfs_md_cursor *cur, sqfs_inode_id id, sq_off_t base);
+void sqfs_md_cursor_inode(sqfs_md_cursor *cur, sqfs_inode_id id, sqfs_off_t base);
 
 sqfs_err sqfs_md_read(sqfs *fs, sqfs_md_cursor *cur, void *buf, size_t size);
 
 
 sqfs_err sqfs_inode_get(sqfs *fs, sqfs_inode *inode, sqfs_inode_id id);
 
-sq_mode_t sqfs_mode(int inode_type);
-sqfs_err sqfs_id_get(sqfs *fs, uint16_t idx, sq_id_t *id);
+sqfs_mode_t sqfs_mode(int inode_type);
+sqfs_err sqfs_id_get(sqfs *fs, uint16_t idx, sqfs_id_t *id);
 
 /* Puts up to *size characters of the link name into buf. Always null-
  * terminates the buffer. Pass null as buf to have the size returned. */

diff --git a/table.c b/table.c
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-sqfs_err sqfs_table_init(sqfs_table *table, sq_fd_t fd, sq_off_t start, size_t each,
+sqfs_err sqfs_table_init(sqfs_table *table, sqfs_fd_t fd, sqfs_off_t start, size_t each,
 		size_t count) {
 	size_t i;
 	size_t nblocks, bread;
@@ -69,7 +69,7 @@ sqfs_err sqfs_table_get(sqfs_table *table, sqfs *fs, size_t idx, void *buf) {
 	size_t bnum = pos / SQUASHFS_METADATA_SIZE,
 		off = pos % SQUASHFS_METADATA_SIZE;
 
-	sq_off_t bpos = table->blocks[bnum];
+	sqfs_off_t bpos = table->blocks[bnum];
 	if (sqfs_md_cache(fs, &bpos, &block))
 		return SQFS_ERR;
 

diff --git a/table.h b/table.h
@@ -34,7 +34,7 @@ typedef struct {
 	uint64_t *blocks;
 } sqfs_table;
 
-sqfs_err sqfs_table_init(sqfs_table *table, sq_fd_t fd, sq_off_t start, size_t each,
+sqfs_err sqfs_table_init(sqfs_table *table, sqfs_fd_t fd, sqfs_off_t start, size_t each,
 	size_t count);
 void sqfs_table_destroy(sqfs_table *table);
 

diff --git a/win/win32.h b/win/win32.h
@@ -37,11 +37,11 @@
 #define S_ISDIR(_m) (((_m) & S_IFMT) == S_IFDIR)
 #define S_ISREG(_m) (((_m) & S_IFMT) == S_IFREG)
 #define S_ISLNK(_m) (((_m) & S_IFMT) == S_IFLNK)
-typedef unsigned short sq_mode_t;
-typedef uint32_t sq_id_t; /* Internal uids/gids are 32-bits */
+typedef unsigned short sqfs_mode_t;
+typedef uint32_t sqfs_id_t; /* Internal uids/gids are 32-bits */
 
 typedef SSIZE_T ssize_t;
-typedef DWORD64 sq_off_t;
-typedef HANDLE sq_fd_t;
+typedef DWORD64 sqfs_off_t;
+typedef HANDLE sqfs_fd_t;
 
 #endif
diff --git a/xattr.c b/xattr.c
@@ -52,7 +52,7 @@ typedef enum {
 } sqfs_xattr_curs;
 
 sqfs_err sqfs_xattr_init(sqfs *fs) {
-	sq_off_t start = fs->sb.xattr_id_table_start;
+	sqfs_off_t start = fs->sb.xattr_id_table_start;
 	size_t bread;
 	if (start == SQUASHFS_INVALID_BLK)
 		return SQFS_OK;