aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Sucan <jan@jansucan.com>2020-12-25 12:50:00 +0100
committerJan Sucan <jan@jansucan.com>2020-12-25 12:50:00 +0100
commit7a38545d0b8df7216c1300b379a51fb14374a4fa (patch)
treeb49926d37c44428a11ab4a8b6467f65c7d46a4c6
parente4ebac4e4dd5b8bc9c86de11489b7f267bf48814 (diff)
Apply clang-format
-rw-r--r--file.c9
-rw-r--r--file.h4
-rw-r--r--main.c403
-rw-r--r--options.c104
-rw-r--r--options.h12
-rw-r--r--print.c8
-rw-r--r--print.h2
-rw-r--r--resources.c28
-rw-r--r--resources.h18
9 files changed, 303 insertions, 285 deletions
diff --git a/file.c b/file.c
index ca22a6b..c6823b9 100644
--- a/file.c
+++ b/file.c
@@ -5,19 +5,18 @@
#include "print.h"
long
-file_size(FILE * const file)
+file_size(FILE *const file)
{
fpos_t p;
- if ((fgetpos(file, &p) != 0)
- || (fseek(file, 0L, SEEK_END) != 0)) {
- return -1;
+ if ((fgetpos(file, &p) != 0) || (fseek(file, 0L, SEEK_END) != 0)) {
+ return -1;
}
const long size = ftell(file);
if (fsetpos(file, &p) != 0) {
- return -1;
+ return -1;
}
return size;
diff --git a/file.h b/file.h
index cb188f6..d62b1ba 100644
--- a/file.h
+++ b/file.h
@@ -3,6 +3,6 @@
#include <stdio.h>
-long file_size(FILE * const file);
+long file_size(FILE *const file);
-#endif /* FILE_H */
+#endif /* FILE_H */
diff --git a/main.c b/main.c
index b011d64..6968710 100644
--- a/main.c
+++ b/main.c
@@ -1,44 +1,46 @@
+#include <endian.h>
+#include <errno.h>
+#include <inttypes.h>
+#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
-#include <stdint.h>
-#include <inttypes.h>
#include <string.h>
-#include <errno.h>
-#include <endian.h>
-#include "options.h"
-#include "resources.h"
#include "file.h"
+#include "options.h"
#include "print.h"
+#include "resources.h"
void
usage(int exit_code)
{
- printf("Usage: diff-dd [-s SECTOR_SIZE] [-b BUFFER_SIZE] [INFILE] REFFILE OUTFILE\n");
+ printf("Usage: diff-dd [-s SECTOR_SIZE] [-b BUFFER_SIZE] [INFILE] REFFILE "
+ " OUTFILE\n");
exit(exit_code);
}
void
-clean_exit(resources_t * const res, int exit_code)
+clean_exit(resources_t *const res, int exit_code)
{
resources_free(res);
exit(exit_code);
}
int
-open_files(const options_t * const opts, resources_t * const res, bool is_action_backup)
+open_files(const options_t *const opts, resources_t *const res,
+ bool is_action_backup)
{
/* Open the input file */
if ((opts->in_file_path != NULL) &&
- ((res->in_file = fopen(opts->in_file_path, "r")) == NULL)) {
- print_error("cannot open input file: %s", strerror(errno));
- return 1;
+ ((res->in_file = fopen(opts->in_file_path, "r")) == NULL)) {
+ print_error("cannot open input file: %s", strerror(errno));
+ return 1;
}
/* Open the reference file */
if ((res->ref_file = fopen(opts->ref_file_path, "r")) == NULL) {
- print_error("cannot open reference file: %s", strerror(errno));
- return 1;
+ print_error("cannot open reference file: %s", strerror(errno));
+ return 1;
}
/* Open the output file
@@ -50,44 +52,45 @@ open_files(const options_t * const opts, resources_t * const res, bool is_action
if (is_action_backup) {
/* When backing up, the output file is truncated to hold the
- * new data
- */
- out_mode[0] = 'w';
- out_mode[1] = '\0';
+ * new data
+ */
+ out_mode[0] = 'w';
+ out_mode[1] = '\0';
}
if ((res->out_file = fopen(opts->out_file_path, out_mode)) == NULL) {
- print_error("cannot open output file: %s", strerror(errno));
- return 1;
+ print_error("cannot open output file: %s", strerror(errno));
+ return 1;
}
return 0;
}
bool
-is_reference_file_valid(resources_t * const res, uint32_t sector_size)
+is_reference_file_valid(resources_t *const res, uint32_t sector_size)
{
const long ref_size = file_size(res->ref_file);
if (ref_size < 0) {
- print_error("cannot get size of reference file: %s", strerror(errno));
- return false;
+ print_error("cannot get size of reference file: %s", strerror(errno));
+ return false;
} else if (ref_size == 0) {
- print_error("reference file is empty");
- return false;
+ print_error("reference file is empty");
+ return false;
} else if ((ref_size % (sizeof(uint64_t) + sector_size)) != 0) {
/* The reference file must hold equally sized sectors and the
- * offset of each of them
- */
- print_error("reference file has size that cannot contain valid diff data");
- return false;
+ * offset of each of them
+ */
+ print_error(
+ "reference file has size that cannot contain valid diff data");
+ return false;
}
const long out_size = file_size(res->out_file);
if (out_size < 0) {
- print_error("cannot get size of output file: %s", strerror(errno));
- return 1;
+ print_error("cannot get size of output file: %s", strerror(errno));
+ return 1;
}
uint64_t ref_offset = 0;
@@ -95,196 +98,211 @@ is_reference_file_valid(resources_t * const res, uint32_t sector_size)
/* Scan the reference file and check */
for (;;) {
- uint64_t out_offset;
- /* Read the next offset */
- const size_t ref_read = fread(&out_offset, sizeof(out_offset), 1U, res->ref_file);
- out_offset = le64toh(out_offset);
-
- if (feof(res->ref_file)) {
- break;
- } else if ((ref_read != 1U) || ferror(res->ref_file)) {
- print_error("cannot read from reference file: %s", strerror(errno));
- return false;
- } else if (((ref_offset != 0) && (out_offset <= prev_out_offset)) ||
- ((out_offset + sector_size) > out_size)) {
- /* The offset must be higher than the previous one and it
- * must point into the file
- */
- print_error("reference file is not valid");
- return false;
- } else if (fseek(res->ref_file, sector_size, SEEK_CUR) != 0) {
- print_error("cannot seek in reference file: %s", strerror(errno));
- return false;
- }
-
- prev_out_offset = out_offset;
+ uint64_t out_offset;
+ /* Read the next offset */
+ const size_t ref_read =
+ fread(&out_offset, sizeof(out_offset), 1U, res->ref_file);
+ out_offset = le64toh(out_offset);
+
+ if (feof(res->ref_file)) {
+ break;
+ } else if ((ref_read != 1U) || ferror(res->ref_file)) {
+ print_error("cannot read from reference file: %s", strerror(errno));
+ return false;
+ } else if (((ref_offset != 0) && (out_offset <= prev_out_offset)) ||
+ ((out_offset + sector_size) > out_size)) {
+ /* The offset must be higher than the previous one and it
+ * must point into the file
+ */
+ print_error("reference file is not valid");
+ return false;
+ } else if (fseek(res->ref_file, sector_size, SEEK_CUR) != 0) {
+ print_error("cannot seek in reference file: %s", strerror(errno));
+ return false;
+ }
+
+ prev_out_offset = out_offset;
}
if (ftell(res->ref_file) != ref_size) {
/* The reference file must be read completely */
- print_error("reference file is not valid");
- return false;
+ print_error("reference file is not valid");
+ return false;
} else if (fseek(res->ref_file, 0L, SEEK_SET) != 0) {
/* The file must be prepared for the restoring */
- print_error("cannot seek in reference file: %s", strerror(errno));
- return false;
+ print_error("cannot seek in reference file: %s", strerror(errno));
+ return false;
}
return true;
}
int
-diff_backup(const options_t * const opts, resources_t * const res)
+diff_backup(const options_t *const opts, resources_t *const res)
{
const long in_size = file_size(res->in_file);
if (in_size < 0) {
- print_error("cannot get size of input file: %s", strerror(errno));
- return 1;
+ print_error("cannot get size of input file: %s", strerror(errno));
+ return 1;
}
const long ref_size = file_size(res->ref_file);
if (ref_size < 0) {
- print_error("cannot get size of reference file: %s", strerror(errno));
- return 1;
+ print_error("cannot get size of reference file: %s", strerror(errno));
+ return 1;
}
/* Check sizes of the input file and the reference file */
if (in_size != ref_size) {
- print_error("input file and reference file differ in size");
- return 1;
+ print_error("input file and reference file differ in size");
+ return 1;
} else if ((in_size % opts->sector_size) != 0) {
- print_error("size of input file and reference file is not multiple of"PRIu32, opts->sector_size);
- return 1;
+ print_error(
+ "size of input file and reference file is not multiple of" PRIu32,
+ opts->sector_size);
+ return 1;
}
/* Allocate the buffers */
/* The output buffer contains also the offsets */
- const size_t out_buffer_size = ((opts->buffer_size / opts->sector_size) * sizeof(uint64_t)) +
- opts->buffer_size;
-
- if ((res->in_buffer = (char *) malloc(opts->buffer_size)) == NULL) {
- print_error("cannot allocate buffer for input file data");
- return 1;
- } else if ((res->ref_buffer = (char *) malloc(opts->buffer_size)) == NULL) {
- print_error("cannot allocate buffer for reference file data");
- return 1;
- } else if ((res->out_buffer = (char *) malloc(out_buffer_size)) == NULL) {
- print_error("cannot allocate buffer for output file data");
- return 1;
+ const size_t out_buffer_size =
+ ((opts->buffer_size / opts->sector_size) * sizeof(uint64_t)) +
+ opts->buffer_size;
+
+ if ((res->in_buffer = (char *)malloc(opts->buffer_size)) == NULL) {
+ print_error("cannot allocate buffer for input file data");
+ return 1;
+ } else if ((res->ref_buffer = (char *)malloc(opts->buffer_size)) == NULL) {
+ print_error("cannot allocate buffer for reference file data");
+ return 1;
+ } else if ((res->out_buffer = (char *)malloc(out_buffer_size)) == NULL) {
+ print_error("cannot allocate buffer for output file data");
+ return 1;
}
size_t out_buffer_index = 0;
uint64_t offset = 0;
for (;;) {
- /* Read the sectors from the input file to the buffer */
- const size_t in_read = fread(res->in_buffer, 1U, opts->buffer_size, res->in_file);
-
- if ((in_read % opts->sector_size) != 0) {
- print_error("data read from input file is not multiple of sector size");
- return 1;
- } else if (ferror(res->in_file)) {
- print_error("cannot read from input file: %s", strerror(errno));
- return 1;
- }
-
- /* Read sectors from the reference file to the buffer */
- const size_t ref_read = fread(res->ref_buffer, 1U, opts->buffer_size, res->ref_file);
-
- if ((ref_read % opts->sector_size) != 0) {
- print_error("data read from reference file is not multiple of sector size");
- return 1;
- } else if (ferror(res->ref_file)) {
- print_error("%s", strerror(errno));
- return 1;
- }
-
- if (in_read != ref_read) {
- print_error("data read from input file and reference file differ in size");
- return 1;
- }
-
- /* Process sectors in the buffer */
- for (size_t i = 0; i < in_read; i += opts->sector_size) {
- /* Compare the sectors */
- int changed = 0;
- const size_t j_end = i + opts->sector_size;
- for (size_t j = i; j < j_end; ++j) {
- if (res->in_buffer[j] != res->ref_buffer[j]) {
- changed = 1;
- break;
- }
- }
-
- if (changed) {
- /* Write changed sector */
- if (out_buffer_index >= out_buffer_size) {
- /* The output buffer is full. Write it to the
- * output file.
- */
- const size_t x = fwrite(res->out_buffer, 1U, out_buffer_index, res->out_file);
-
- if (x != out_buffer_index) {
- print_error("cannot write to output file: %s", strerror(errno));
- return 1;
- }
-
- out_buffer_index = 0;
- }
-
- const uint64_t o = htole64(offset);
-
- memcpy(res->out_buffer + out_buffer_index, (void *) &o, sizeof(o));
- memcpy(res->out_buffer + out_buffer_index, &(res->in_buffer[i]), opts->sector_size);
- out_buffer_index += sizeof(o) + opts->sector_size;
- }
-
- offset += opts->sector_size;
- }
-
- if (feof(res->in_file)) {
- break;
- }
+ /* Read the sectors from the input file to the buffer */
+ const size_t in_read =
+ fread(res->in_buffer, 1U, opts->buffer_size, res->in_file);
+
+ if ((in_read % opts->sector_size) != 0) {
+ print_error(
+ "data read from input file is not multiple of sector size");
+ return 1;
+ } else if (ferror(res->in_file)) {
+ print_error("cannot read from input file: %s", strerror(errno));
+ return 1;
+ }
+
+ /* Read sectors from the reference file to the buffer */
+ const size_t ref_read =
+ fread(res->ref_buffer, 1U, opts->buffer_size, res->ref_file);
+
+ if ((ref_read % opts->sector_size) != 0) {
+ print_error(
+ "data read from reference file is not multiple of sector size");
+ return 1;
+ } else if (ferror(res->ref_file)) {
+ print_error("%s", strerror(errno));
+ return 1;
+ }
+
+ if (in_read != ref_read) {
+ print_error(
+ "data read from input file and reference file differ in size");
+ return 1;
+ }
+
+ /* Process sectors in the buffer */
+ for (size_t i = 0; i < in_read; i += opts->sector_size) {
+ /* Compare the sectors */
+ int changed = 0;
+ const size_t j_end = i + opts->sector_size;
+ for (size_t j = i; j < j_end; ++j) {
+ if (res->in_buffer[j] != res->ref_buffer[j]) {
+ changed = 1;
+ break;
+ }
+ }
+
+ if (changed) {
+ /* Write changed sector */
+ if (out_buffer_index >= out_buffer_size) {
+ /* The output buffer is full. Write it to the
+ * output file.
+ */
+ const size_t x = fwrite(res->out_buffer, 1U,
+ out_buffer_index, res->out_file);
+
+ if (x != out_buffer_index) {
+ print_error("cannot write to output file: %s",
+ strerror(errno));
+ return 1;
+ }
+
+ out_buffer_index = 0;
+ }
+
+ const uint64_t o = htole64(offset);
+
+ memcpy(res->out_buffer + out_buffer_index, (void *)&o,
+ sizeof(o));
+ memcpy(res->out_buffer + out_buffer_index, &(res->in_buffer[i]),
+ opts->sector_size);
+ out_buffer_index += sizeof(o) + opts->sector_size;
+ }
+
+ offset += opts->sector_size;
+ }
+
+ if (feof(res->in_file)) {
+ break;
+ }
}
/* Write out the output buffer */
if (out_buffer_index >= 0) {
- const size_t x = fwrite(res->out_buffer, 1U, out_buffer_index, res->out_file);
+ const size_t x =
+ fwrite(res->out_buffer, 1U, out_buffer_index, res->out_file);
- if (x != out_buffer_index) {
- print_error("cannot write to output file: %s", strerror(errno));
- return 1;
- }
+ if (x != out_buffer_index) {
+ print_error("cannot write to output file: %s", strerror(errno));
+ return 1;
+ }
}
return 0;
}
int
-diff_restore(const options_t * const opts, resources_t * const res)
+diff_restore(const options_t *const opts, resources_t *const res)
{
/* Check validity of the reference file */
if (!is_reference_file_valid(res, opts->sector_size)) {
- return 1;
+ return 1;
}
const long ref_size = file_size(res->ref_file);
if (ref_size < 0) {
- print_error("cannot get size of reference file: %s", strerror(errno));
- return 1;
+ print_error("cannot get size of reference file: %s", strerror(errno));
+ return 1;
}
/* Allocate the buffer for data from the reference file */
/* The reference buffer contains also the offsets */
- const size_t ref_buffer_size = ((opts->buffer_size / opts->sector_size) * sizeof(uint64_t)) +
- opts->buffer_size;
+ const size_t ref_buffer_size =
+ ((opts->buffer_size / opts->sector_size) * sizeof(uint64_t)) +
+ opts->buffer_size;
- if ((res->ref_buffer = (char *) malloc(ref_buffer_size)) == NULL) {
- print_error("cannot allocate buffer for reference file data");
- return 1;
+ if ((res->ref_buffer = (char *)malloc(ref_buffer_size)) == NULL) {
+ print_error("cannot allocate buffer for reference file data");
+ return 1;
}
/* Restore data from the differential image */
@@ -292,49 +310,50 @@ diff_restore(const options_t * const opts, resources_t * const res)
for (;;) {
/* Read data of the offset and the next sector */
- const size_t ref_read = fread(res->ref_buffer, ref_buffer_size, 1U, res->ref_file);
-
- if (feof(res->ref_file)) {
- break;
- } else if ((ref_read != 1U) || ferror(res->ref_file)) {
- print_error("cannot read from reference file: %s", strerror(errno));
- return 1;
- }
-
- /* Get offset */
- out_offset = le64toh(*((uint64_t *) res->ref_buffer));
-
- if (fseek(res->out_file, out_offset, SEEK_SET) != 0) {
- print_error("cannot seek in output file: %s", strerror(errno));
- return 1;
- }
-
- /* Write the sector data to the output file */
- const size_t out_written = fwrite(res->ref_buffer + sizeof(out_offset), opts->sector_size,
- 1U, res->out_file);
-
- if (out_written != 1U) {
- print_error("cannot write to output file: %s", strerror(errno));
- return 1;
- }
+ const size_t ref_read =
+ fread(res->ref_buffer, ref_buffer_size, 1U, res->ref_file);
+
+ if (feof(res->ref_file)) {
+ break;
+ } else if ((ref_read != 1U) || ferror(res->ref_file)) {
+ print_error("cannot read from reference file: %s", strerror(errno));
+ return 1;
+ }
+
+ /* Get offset */
+ out_offset = le64toh(*((uint64_t *)res->ref_buffer));
+
+ if (fseek(res->out_file, out_offset, SEEK_SET) != 0) {
+ print_error("cannot seek in output file: %s", strerror(errno));
+ return 1;
+ }
+
+ /* Write the sector data to the output file */
+ const size_t out_written = fwrite(res->ref_buffer + sizeof(out_offset),
+ opts->sector_size, 1U, res->out_file);
+
+ if (out_written != 1U) {
+ print_error("cannot write to output file: %s", strerror(errno));
+ return 1;
+ }
}
/* The reference file must be read completely */
if (ftell(res->ref_file) != ref_size) {
- print_error("reference file is not valid");
- return 1;
+ print_error("reference file is not valid");
+ return 1;
}
return 0;
}
int
-main(int argc, char ** argv)
+main(int argc, char **argv)
{
options_t opts;
if (options_parse(argc, argv, &opts) || opts.help) {
- usage(1);
+ usage(1);
}
const bool is_action_backup = (opts.in_file_path != NULL);
@@ -343,10 +362,10 @@ main(int argc, char ** argv)
resources_init(&res);
if (open_files(&opts, &res, is_action_backup) != 0) {
- clean_exit(&res, 1);
+ clean_exit(&res, 1);
} else if (is_action_backup) {
clean_exit(&res, diff_backup(&opts, &res));
} else {
- clean_exit(&res, diff_restore(&opts, &res));
+ clean_exit(&res, diff_restore(&opts, &res));
}
}
diff --git a/options.c b/options.c
index 85ab624..2017ba5 100644
--- a/options.c
+++ b/options.c
@@ -1,85 +1,85 @@
+#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <errno.h>
#include <unistd.h>
#include "options.h"
#include "print.h"
-#define OPTIONS_DEFAULT_SECTOR_SIZE 512
-#define OPTIONS_DEFAULT_BUFFER_SIZE (4 * 1024 * 1024)
+#define OPTIONS_DEFAULT_SECTOR_SIZE 512
+#define OPTIONS_DEFAULT_BUFFER_SIZE (4 * 1024 * 1024)
-void options_init(options_t * const opts);
-int options_parse_unsigned(const char * const arg, uint32_t * const value);
+void options_init(options_t *const opts);
+int options_parse_unsigned(const char *const arg, uint32_t *const value);
int
-options_parse(int argc, char ** argv, options_t * const opts)
+options_parse(int argc, char **argv, options_t *const opts)
{
options_init(opts);
int ch;
- char * arg_sector_size = NULL;
- char * arg_buffer_size = NULL;
+ char *arg_sector_size = NULL;
+ char *arg_buffer_size = NULL;
while ((ch = getopt(argc, argv, ":s:b:h")) != -1) {
- switch(ch) {
- case 's':
- arg_sector_size = optarg;
- break;
-
- case 'b':
- arg_buffer_size = optarg;
- break;
-
- case 'h':
- opts->help = true;
- break;
-
- case ':':
- print_error("missing argument for option '-%c'", optopt);
- return 1;
-
- default:
- print_error("unknown option '-%c'", optopt);
- return 1;
- }
+ switch (ch) {
+ case 's':
+ arg_sector_size = optarg;
+ break;
+
+ case 'b':
+ arg_buffer_size = optarg;
+ break;
+
+ case 'h':
+ opts->help = true;
+ break;
+
+ case ':':
+ print_error("missing argument for option '-%c'", optopt);
+ return 1;
+
+ default:
+ print_error("unknown option '-%c'", optopt);
+ return 1;
+ }
}
argc -= optind;
argv += optind;
if (opts->help) {
- return 0;
+ return 0;
} else if (argc < 2) {
- print_error("missing arguments");
- return 1;
+ print_error("missing arguments");
+ return 1;
} else if (argc > 3) {
- print_error("too many arguments");
- return 1;
+ print_error("too many arguments");
+ return 1;
}
/* Convert numbers in the arguments */
if ((arg_sector_size != NULL) &&
- options_parse_unsigned(arg_sector_size, &(opts->sector_size))) {
- print_error("incorrect sector size");
- return 1;
+ options_parse_unsigned(arg_sector_size, &(opts->sector_size))) {
+ print_error("incorrect sector size");
+ return 1;
} else if ((arg_buffer_size != NULL) &&
- options_parse_unsigned(arg_buffer_size, &(opts->buffer_size))) {
- print_error("incorrect buffer size");
- return 1;
+ options_parse_unsigned(arg_buffer_size, &(opts->buffer_size))) {
+ print_error("incorrect buffer size");
+ return 1;
} else if (opts->sector_size == 0) {
- print_error("sector size cannot be 0");
- return 1;
+ print_error("sector size cannot be 0");
+ return 1;
} else if (opts->buffer_size == 0) {
- print_error("buffer size cannot be 0");
- return 1;
+ print_error("buffer size cannot be 0");
+ return 1;
} else if (opts->sector_size > opts->buffer_size) {
- print_error("sector size cannot larger than buffer size");
- return 1;
+ print_error("sector size cannot larger than buffer size");
+ return 1;
} else if ((opts->buffer_size % opts->sector_size) != 0) {
- print_error("buffer size is not multiple of sector size");
- return 1;
+ print_error("buffer size is not multiple of sector size");
+ return 1;
}
/* Pick the file paths */
@@ -87,14 +87,14 @@ options_parse(int argc, char ** argv, options_t * const opts)
opts->out_file_path = argv[last_path_index--];
opts->ref_file_path = argv[last_path_index--];
if (last_path_index >= 0) {
- opts->in_file_path = argv[last_path_index];
+ opts->in_file_path = argv[last_path_index];
}
return 0;
}
void
-options_init(options_t * const opts)
+options_init(options_t *const opts)
{
opts->help = false;
opts->sector_size = OPTIONS_DEFAULT_SECTOR_SIZE;
@@ -106,9 +106,9 @@ options_init(options_t * const opts)
}
int
-options_parse_unsigned(const char * const arg, uint32_t * const value)
+options_parse_unsigned(const char *const arg, uint32_t *const value)
{
- char * end;
+ char *end;
errno = 0;
diff --git a/options.h b/options.h
index 04573fa..71259aa 100644
--- a/options.h
+++ b/options.h
@@ -5,15 +5,15 @@
#include <stdint.h>
typedef struct {
- bool help;
+ bool help;
uint32_t sector_size;
uint32_t buffer_size;
- const char * in_file_path;
- const char * ref_file_path;
- const char * out_file_path;
+ const char *in_file_path;
+ const char *ref_file_path;
+ const char *out_file_path;
} options_t;
-int options_parse(int argc, char ** argv, options_t * const opts);
+int options_parse(int argc, char **argv, options_t *const opts);
-#endif /* OPTIONS_H */
+#endif /* OPTIONS_H */
diff --git a/print.c b/print.c
index e95d035..824f818 100644
--- a/print.c
+++ b/print.c
@@ -1,13 +1,13 @@
-#include <stdio.h>
#include <stdarg.h>
+#include <stdio.h>
#include "print.h"
-#define PRINT_ERROR_PREFIX "ERROR: "
-#define PRINT_ERROR_SUFFIX "\n"
+#define PRINT_ERROR_PREFIX "ERROR: "
+#define PRINT_ERROR_SUFFIX "\n"
void
-print_error(const char * const format, ...)
+print_error(const char *const format, ...)
{
fprintf(stderr, PRINT_ERROR_PREFIX);
diff --git a/print.h b/print.h
index 0613dfc..7992087 100644
--- a/print.h
+++ b/print.h
@@ -1,6 +1,6 @@
#ifndef PRINT_H
#define PRINT_H
-void print_error(const char * const format, ...);
+void print_error(const char *const format, ...);
#endif /* PRINT_H */
diff --git a/resources.c b/resources.c
index 60356c2..3eebd1c 100644
--- a/resources.c
+++ b/resources.c
@@ -4,7 +4,7 @@
#include "resources.h"
void
-resources_init(resources_t * const res)
+resources_init(resources_t *const res)
{
res->in_file = NULL;
res->ref_file = NULL;
@@ -15,30 +15,30 @@ resources_init(resources_t * const res)
}
void
-resources_free(resources_t * const res)
+resources_free(resources_t *const res)
{
if (res->in_file != NULL) {
- fclose(res->in_file);
- res->in_file = NULL;
+ fclose(res->in_file);
+ res->in_file = NULL;
}
if (res->ref_file != NULL) {
- fclose(res->ref_file);
- res->ref_file = NULL;
+ fclose(res->ref_file);
+ res->ref_file = NULL;
}
if (res->out_file != NULL) {
- fclose(res->out_file);
- res->out_file = NULL;
+ fclose(res->out_file);
+ res->out_file = NULL;
}
if (res->in_buffer != NULL) {
- free(res->in_buffer);
- res->in_buffer = NULL;
+ free(res->in_buffer);
+ res->in_buffer = NULL;
}
if (res->ref_buffer != NULL) {
- free(res->ref_buffer);
- res->ref_buffer = NULL;
+ free(res->ref_buffer);
+ res->ref_buffer = NULL;
}
if (res->out_buffer != NULL) {
- free(res->out_buffer);
- res->out_buffer = NULL;
+ free(res->out_buffer);
+ res->out_buffer = NULL;
}
}
diff --git a/resources.h b/resources.h
index 4b16312..0cf9777 100644
--- a/resources.h
+++ b/resources.h
@@ -2,16 +2,16 @@
#define RESOURCES_H
typedef struct {
- FILE * in_file;
- FILE * ref_file;
- FILE * out_file;
+ FILE *in_file;
+ FILE *ref_file;
+ FILE *out_file;
- char * in_buffer;
- char * ref_buffer;
- char * out_buffer;
+ char *in_buffer;
+ char *ref_buffer;
+ char *out_buffer;
} resources_t;
-void resources_init(resources_t * const res);
-void resources_free(resources_t * const res);
+void resources_init(resources_t *const res);
+void resources_free(resources_t *const res);
-#endif /* RESOURCES_H */
+#endif /* RESOURCES_H */