chores: _new constructors now support err to be NULL

Gottox · Aug 2, 2023 · a3e33a5 · a3e33a5
1 parent 1236f53
commit a3e33a5
Show file tree

Hide file tree

Showing 15 changed files with 108 additions and 60 deletions.
diff --git a/lib/archive/archive.c b/lib/archive/archive.c
@@ -77,14 +77,20 @@ get_data_segment_size(const struct SqshSuperblock *superblock) {
 struct SqshArchive *
 sqsh_archive_new(
 		const void *source, const struct SqshConfig *config, int *err) {
+	int rv = 0;
 	struct SqshArchive *archive = calloc(1, sizeof(struct SqshArchive));
 	if (archive == NULL) {
-		return NULL;
+		rv = -SQSH_ERROR_MALLOC_FAILED;
+		goto out;
 	}
-	*err = sqsh__archive_init(archive, source, config);
-	if (*err < 0) {
+	rv = sqsh__archive_init(archive, source, config);
+	if (rv < 0) {
 		free(archive);
-		return NULL;
+		archive = NULL;
+	}
+out:
+	if (err != NULL) {
+		*err = rv;
 	}
 	return archive;
 }

diff --git a/lib/archive/compression_options.c b/lib/archive/compression_options.c
@@ -48,17 +48,23 @@ compression_options(const struct SqshCompressionOptions *context) {
 
 struct SqshCompressionOptions *
 sqsh_compression_options_new(struct SqshArchive *sqsh, int *err) {
-	struct SqshCompressionOptions *context =
+	int rv = 0;
+	struct SqshCompressionOptions *compression_options =
 			calloc(1, sizeof(struct SqshCompressionOptions));
-	if (context == NULL) {
-		return NULL;
+	if (compression_options == NULL) {
+		rv = -SQSH_ERROR_MALLOC_FAILED;
+		goto out;
 	}
-	*err = sqsh__compression_options_init(context, sqsh);
-	if (*err < 0) {
-		free(context);
-		return NULL;
+	rv = sqsh__compression_options_init(compression_options, sqsh);
+	if (rv < 0) {
+		free(compression_options);
+		compression_options = NULL;
+	}
+out:
+	if (err != NULL) {
+		*err = rv;
 	}
-	return context;
+	return compression_options;
 }
 
 int

diff --git a/lib/data/compression_options_data.c b/lib/data/compression_options_data.c
@@ -36,9 +36,9 @@
 #include "../../include/sqsh_data_private.h"
 
 #if defined(__FreeBSD__)
-#include <sys/endian.h>
+#	include <sys/endian.h>
 #else
-#include <endian.h>
+#	include <endian.h>
 #endif
 
 struct SQSH_UNALIGNED SqshDataCompressionOptionsGzip {

diff --git a/lib/data/directory_data.c b/lib/data/directory_data.c
@@ -36,9 +36,9 @@
 #include "../../include/sqsh_data_private.h"
 
 #if defined(__FreeBSD__)
-#include <sys/endian.h>
+#	include <sys/endian.h>
 #else
-#include <endian.h>
+#	include <endian.h>
 #endif
 
 struct SQSH_UNALIGNED SqshDataDirectoryEntry {

diff --git a/lib/data/fragment_data.c b/lib/data/fragment_data.c
@@ -36,9 +36,9 @@
 #include "../../include/sqsh_data_private.h"
 
 #if defined(__FreeBSD__)
-#include <sys/endian.h>
+#	include <sys/endian.h>
 #else
-#include <endian.h>
+#	include <endian.h>
 #endif
 
 struct SQSH_UNALIGNED SqshDataFragment {

diff --git a/lib/data/inode_data.c b/lib/data/inode_data.c
@@ -36,9 +36,9 @@
 #include "../../include/sqsh_data_private.h"
 
 #if defined(__FreeBSD__)
-#include <sys/endian.h>
+#	include <sys/endian.h>
 #else
-#include <endian.h>
+#	include <endian.h>
 #endif
 
 struct SQSH_UNALIGNED SqshDataInodeDirectoryIndex {

diff --git a/lib/data/metablock_data.c b/lib/data/metablock_data.c
@@ -36,9 +36,9 @@
 #include "../../include/sqsh_data_private.h"
 
 #if defined(__FreeBSD__)
-#include <sys/endian.h>
+#	include <sys/endian.h>
 #else
-#include <endian.h>
+#	include <endian.h>
 #endif
 
 struct SQSH_UNALIGNED SqshDataMetablock {

diff --git a/lib/data/superblock_data.c b/lib/data/superblock_data.c
@@ -36,9 +36,9 @@
 #include "../../include/sqsh_data_private.h"
 
 #if defined(__FreeBSD__)
-#include <sys/endian.h>
+#	include <sys/endian.h>
 #else
-#include <endian.h>
+#	include <endian.h>
 #endif
 
 struct SQSH_UNALIGNED SqshDataSuperblock {

diff --git a/lib/data/xattr_data.c b/lib/data/xattr_data.c
@@ -36,9 +36,9 @@
 #include "../../include/sqsh_data_private.h"
 
 #if defined(__FreeBSD__)
-#include <sys/endian.h>
+#	include <sys/endian.h>
 #else
-#include <endian.h>
+#	include <endian.h>
 #endif
 
 #include <string.h>

diff --git a/lib/directory/directory_iterator.c b/lib/directory/directory_iterator.c
@@ -197,15 +197,21 @@ sqsh__directory_iterator_init(
 
 struct SqshDirectoryIterator *
 sqsh_directory_iterator_new(struct SqshInode *inode, int *err) {
+	int rv = 0;
 	struct SqshDirectoryIterator *iterator =
 			calloc(1, sizeof(struct SqshDirectoryIterator));
-	if (iterator == NULL) {
-		return NULL;
+	if (inode == NULL) {
+		rv = -SQSH_ERROR_MALLOC_FAILED;
+		goto out;
 	}
-	*err = sqsh__directory_iterator_init(iterator, inode);
-	if (*err < 0) {
-		free(iterator);
-		return NULL;
+	rv = sqsh__directory_iterator_init(iterator, inode);
+	if (rv < 0) {
+		free(inode);
+		inode = NULL;
+	}
+out:
+	if (err != NULL) {
+		*err = rv;
 	}
 	return iterator;
 }

diff --git a/lib/file/file_iterator.c b/lib/file/file_iterator.c
@@ -75,15 +75,21 @@ sqsh__file_iterator_init(
 
 struct SqshFileIterator *
 sqsh_file_iterator_new(const struct SqshInode *inode, int *err) {
+	int rv = 0;
 	struct SqshFileIterator *iterator =
 			calloc(1, sizeof(struct SqshFileIterator));
 	if (iterator == NULL) {
-		return NULL;
+		rv = -SQSH_ERROR_MALLOC_FAILED;
+		goto out;
 	}
-	*err = sqsh__file_iterator_init(iterator, inode);
-	if (*err < 0) {
+	rv = sqsh__file_iterator_init(iterator, inode);
+	if (rv < 0) {
 		free(iterator);
-		return NULL;
+		iterator = NULL;
+	}
+out:
+	if (err != NULL) {
+		*err = rv;
 	}
 	return iterator;
 }

diff --git a/lib/file/file_reader.c b/lib/file/file_reader.c
@@ -85,16 +85,22 @@ sqsh__file_reader_init(
 
 struct SqshFileReader *
 sqsh_file_reader_new(const struct SqshInode *inode, int *err) {
-	struct SqshFileReader *context = calloc(1, sizeof(struct SqshFileReader));
-	if (context == NULL) {
-		return NULL;
+	int rv = 0;
+	struct SqshFileReader *reader = calloc(1, sizeof(struct SqshFileReader));
+	if (reader == NULL) {
+		rv = -SQSH_ERROR_MALLOC_FAILED;
+		goto out;
 	}
-	*err = sqsh__file_reader_init(context, inode);
-	if (*err < 0) {
-		free(context);
-		return NULL;
+	rv = sqsh__file_reader_init(reader, inode);
+	if (rv < 0) {
+		free(reader);
+		reader = NULL;
+	}
+out:
+	if (err != NULL) {
+		*err = rv;
 	}
-	return context;
+	return reader;
 }
 
 int

diff --git a/lib/inode/inode.c b/lib/inode/inode.c
@@ -197,16 +197,22 @@ sqsh__inode_init(
 
 struct SqshInode *
 sqsh_inode_new(struct SqshArchive *sqsh, uint64_t inode_ref, int *err) {
-	struct SqshInode *context = calloc(1, sizeof(struct SqshInode));
-	if (context == NULL) {
-		return NULL;
+	int rv = 0;
+	struct SqshInode *inode = calloc(1, sizeof(struct SqshInode));
+	if (inode == NULL) {
+		rv = -SQSH_ERROR_MALLOC_FAILED;
+		goto out;
 	}
-	*err = sqsh__inode_init(context, sqsh, inode_ref);
-	if (*err < 0) {
-		free(context);
-		return NULL;
+	rv = sqsh__inode_init(inode, sqsh, inode_ref);
+	if (rv < 0) {
+		free(inode);
+		inode = NULL;
+	}
+out:
+	if (err != NULL) {
+		*err = rv;
 	}
-	return context;
+	return inode;
 }
 
 bool

diff --git a/lib/tree/walker.c b/lib/tree/walker.c
@@ -113,14 +113,20 @@ sqsh__tree_walker_init(
 
 struct SqshTreeWalker *
 sqsh_tree_walker_new(struct SqshArchive *archive, int *err) {
+	int rv = 0;
 	struct SqshTreeWalker *walker = calloc(1, sizeof(struct SqshTreeWalker));
 	if (walker == NULL) {
-		return NULL;
+		rv = -SQSH_ERROR_MALLOC_FAILED;
+		goto out;
 	}
-	*err = sqsh__tree_walker_init(walker, archive);
-	if (*err < 0) {
+	rv = sqsh__tree_walker_init(walker, archive);
+	if (rv < 0) {
 		free(walker);
-		return NULL;
+		walker = NULL;
+	}
+out:
+	if (err != NULL) {
+		*err = rv;
 	}
 	return walker;
 }

diff --git a/lib/xattr/xattr_iterator.c b/lib/xattr/xattr_iterator.c
@@ -110,15 +110,21 @@ sqsh__xattr_iterator_init(
 
 struct SqshXattrIterator *
 sqsh_xattr_iterator_new(const struct SqshInode *inode, int *err) {
+	int rv = 0;
 	struct SqshXattrIterator *iterator =
 			calloc(1, sizeof(struct SqshXattrIterator));
 	if (iterator == NULL) {
-		return NULL;
+		rv = -SQSH_ERROR_MALLOC_FAILED;
+		goto out;
 	}
-	*err = sqsh__xattr_iterator_init(iterator, inode);
-	if (*err < 0) {
+	rv = sqsh__xattr_iterator_init(iterator, inode);
+	if (rv < 0) {
 		free(iterator);
-		return NULL;
+		iterator = NULL;
+	}
+out:
+	if (err != NULL) {
+		*err = rv;
 	}
 	return iterator;
 }