summaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-02-12 02:22:31 +0100
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-02-12 02:26:24 +0100
commit303680ebcd5adaac2934b63a0edc2d9d1a36d7fb (patch)
treebd2012dc6fa56f7259dbe2e5edd7ab3042f8e0a0 /extras
parentec7a522a520017327dd73b4d8e3787016ee1a31e (diff)
Implement a more explicit object system
Make every dynamically allocated, opaque data structure inherit from a common sqfs_object_t structure with common entry points (e.g. destroy). This removes tons of public API functions and replaces them with a simple sqfs_destroy instead. If semantics of the (until now implicit) object system need to be extended, it can be much more conveniantely done this way. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'extras')
-rw-r--r--extras/browse.c10
-rw-r--r--extras/list_files.c8
-rw-r--r--extras/mk42sqfs.c12
-rw-r--r--extras/mknastyfs.c12
4 files changed, 21 insertions, 21 deletions
diff --git a/extras/browse.c b/extras/browse.c
index 49ddb7e..0bca183 100644
--- a/extras/browse.c
+++ b/extras/browse.c
@@ -599,16 +599,16 @@ int main(int argc, char **argv)
status = EXIT_SUCCESS;
free(buffer);
out:
- sqfs_data_reader_destroy(data);
+ sqfs_destroy(data);
out_dir:
if (working_dir != NULL)
free(working_dir);
- sqfs_dir_reader_destroy(dr);
+ sqfs_destroy(dr);
out_id:
- sqfs_id_table_destroy(idtbl);
+ sqfs_destroy(idtbl);
out_cmp:
- cmp->destroy(cmp);
+ sqfs_destroy(cmp);
out_fd:
- file->destroy(file);
+ sqfs_destroy(file);
return status;
}
diff --git a/extras/list_files.c b/extras/list_files.c
index de390f0..5e181f2 100644
--- a/extras/list_files.c
+++ b/extras/list_files.c
@@ -134,12 +134,12 @@ int main(int argc, char **argv)
out:
if (root != NULL)
sqfs_dir_tree_destroy(root);
- sqfs_dir_reader_destroy(dr);
+ sqfs_destroy(dr);
out_id:
- sqfs_id_table_destroy(idtbl);
+ sqfs_destroy(idtbl);
out_cmp:
- cmp->destroy(cmp);
+ sqfs_destroy(cmp);
out_fd:
- file->destroy(file);
+ sqfs_destroy(file);
return status;
}
diff --git a/extras/mk42sqfs.c b/extras/mk42sqfs.c
index 0dbcc4e..53cf2f0 100644
--- a/extras/mk42sqfs.c
+++ b/extras/mk42sqfs.c
@@ -189,16 +189,16 @@ int main(void)
/* cleanup */
status = EXIT_SUCCESS;
- sqfs_id_table_destroy(idtbl);
+ sqfs_destroy(idtbl);
out_dirwr:
- sqfs_dir_writer_destroy(dirwr);
+ sqfs_destroy(dirwr);
out_dm:
- sqfs_meta_writer_destroy(dir_m);
+ sqfs_destroy(dir_m);
out_im:
- sqfs_meta_writer_destroy(inode_m);
+ sqfs_destroy(inode_m);
out_cmp:
- cmp->destroy(cmp);
+ sqfs_destroy(cmp);
out_file:
- file->destroy(file);
+ sqfs_destroy(file);
return status;
}
diff --git a/extras/mknastyfs.c b/extras/mknastyfs.c
index 2a66bc9..b11f8f9 100644
--- a/extras/mknastyfs.c
+++ b/extras/mknastyfs.c
@@ -168,16 +168,16 @@ int main(void)
/* cleanup */
status = EXIT_SUCCESS;
- sqfs_id_table_destroy(idtbl);
+ sqfs_destroy(idtbl);
out_dirwr:
- sqfs_dir_writer_destroy(dirwr);
+ sqfs_destroy(dirwr);
out_dm:
- sqfs_meta_writer_destroy(dir_m);
+ sqfs_destroy(dir_m);
out_im:
- sqfs_meta_writer_destroy(inode_m);
+ sqfs_destroy(inode_m);
out_cmp:
- cmp->destroy(cmp);
+ sqfs_destroy(cmp);
out_file:
- file->destroy(file);
+ sqfs_destroy(file);
return status;
}