Skip to content

Commit dbe47f7

Browse files
SamuelMarksSamuelMarks
committed
fd -HIeh -ec -x clang-format --style=LLVM -i
1 parent 61bc64c commit dbe47f7

File tree

7 files changed

+45
-43
lines changed

7 files changed

+45
-43
lines changed

‎acquire/acquire_checksums.h‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ extern "C" {
3838
*
3939
* @return true if valid.
4040
*/
41-
extern LIBACQUIRE_EXPORT bool crc32c(const char *filename,
42-
const char *hash);
41+
extern LIBACQUIRE_EXPORT bool crc32c(const char *filename, const char *hash);
4342

4443
/**
4544
* @brief Verify file using SHA256 checksum.
@@ -49,8 +48,7 @@ extern LIBACQUIRE_EXPORT bool crc32c(const char *filename,
4948
*
5049
* @return true if valid.
5150
*/
52-
extern LIBACQUIRE_EXPORT bool sha256(const char *filename,
53-
const char *hash);
51+
extern LIBACQUIRE_EXPORT bool sha256(const char *filename, const char *hash);
5452

5553
/**
5654
* @brief Verify file using SHA256 checksum.
@@ -60,8 +58,7 @@ extern LIBACQUIRE_EXPORT bool sha256(const char *filename,
6058
*
6159
* @return true if valid.
6260
*/
63-
extern LIBACQUIRE_EXPORT bool sha512(const char *filename,
64-
const char *hash);
61+
extern LIBACQUIRE_EXPORT bool sha512(const char *filename, const char *hash);
6562

6663
enum Checksum {
6764
LIBACQUIRE_CRC32C,
@@ -83,8 +80,8 @@ extern LIBACQUIRE_EXPORT enum Checksum string2checksum(const char *);
8380
*
8481
* @return Function pointer on success; NULL on failure.
8582
*/
86-
extern LIBACQUIRE_EXPORT bool (
87-
*get_checksum_function(enum Checksum checksum))(const char *, const char *);
83+
extern LIBACQUIRE_EXPORT bool (*get_checksum_function(enum Checksum checksum))(
84+
const char *, const char *);
8885

8986
#ifdef LIBACQUIRE_IMPLEMENTATION
9087
#ifndef LIBACQUIRE_ACQUIRE_CHECKSUMS_IMPL

‎acquire/acquire_download.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ extern "C" {
3737
extern LIBACQUIRE_EXPORT const char *get_download_dir(void);
3838

3939
extern LIBACQUIRE_EXPORT bool is_downloaded(const char *, enum Checksum,
40-
const char *, const char *);
40+
const char *, const char *);
4141

42-
extern LIBACQUIRE_EXPORT int download(const char *, enum Checksum,
43-
const char *, const char[NAME_MAX],
44-
bool, size_t, size_t);
42+
extern LIBACQUIRE_EXPORT int download(const char *, enum Checksum, const char *,
43+
const char[NAME_MAX], bool, size_t,
44+
size_t);
4545

4646
extern LIBACQUIRE_EXPORT int download_many(const char *[], const char *[],
47-
enum Checksum[], const char *,
48-
bool, size_t, size_t);
47+
enum Checksum[], const char *, bool,
48+
size_t, size_t);
4949
#ifdef __cplusplus
5050
}
5151
#endif /* __cplusplus */

‎acquire/acquire_extract.h‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ enum LIBACQUIRE_EXPORT Archive {
4444
* `EXIT_FAILURE` or non-`EXIT_SUCCESS` otherwise.
4545
*/
4646
extern LIBACQUIRE_EXPORT int extract_archive(enum Archive archive,
47-
const char *archive_filepath,
48-
const char *output_folder);
47+
const char *archive_filepath,
48+
const char *output_folder);
4949

5050
/**
5151
* @brief Determine archive type based on extension
@@ -57,8 +57,7 @@ extern LIBACQUIRE_EXPORT int extract_archive(enum Archive archive,
5757
* @return `enum Archive` discriminant; including potential values of
5858
* `LIBACQUIRE_UNSUPPORTED_ARCHIVE` xor `LIBACQUIRE_INFER`.
5959
*/
60-
extern LIBACQUIRE_EXPORT enum Archive
61-
extension2archive(const char *extension);
60+
extern LIBACQUIRE_EXPORT enum Archive extension2archive(const char *extension);
6261

6362
#ifdef LIBACQUIRE_IMPLEMENTATION
6463
#ifndef LIBACQUIRE_IMPL_ACQUIRE_EXTRACT_H

‎acquire/acquire_fileutils.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ extern LIBACQUIRE_EXPORT bool is_relative(const char *path);
7979
*/
8080
extern LIBACQUIRE_EXPORT const char *get_extension(const char *path);
8181

82-
#if defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS)
82+
#if defined(LIBACQUIRE_IMPLEMENTATION) && \
83+
!defined(LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS)
8384
#define LIBACQUIRE_ACQUIRE_FILEUTILS_IMPL
8485

8586
bool is_directory(const char *const path) {
@@ -159,7 +160,8 @@ const char *get_extension(const char *const filename) {
159160
return strncmp(ext0, ".tar", 4) == 0 ? ext0 : ext1;
160161
}
161162

162-
#endif /* defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS) */
163+
#endif /* defined(LIBACQUIRE_IMPLEMENTATION) && \
164+
!defined(LIBACQUIRE_IMPL_ACQUIRE_FILEUTILS) */
163165

164166
#ifdef __cplusplus
165167
}

‎acquire/acquire_net_common.h‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ extern "C" {
2626
* @return true if already downloaded and checksum verifies, else false
2727
*/
2828
extern LIBACQUIRE_EXPORT bool is_downloaded(const char *url,
29-
enum Checksum checksum,
30-
const char *hash,
31-
const char *target_location);
29+
enum Checksum checksum,
30+
const char *hash,
31+
const char *target_location);
3232

33-
#if defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_IMPL_ACQUIRE_NET_COMMON)
33+
#if defined(LIBACQUIRE_IMPLEMENTATION) && \
34+
!defined(LIBACQUIRE_IMPL_ACQUIRE_NET_COMMON)
3435
#define LIBACQUIRE_IMPL_ACQUIRE_NET_COMMON 1
3536

3637
#ifndef DOWNLOAD_DIR_IMPL
@@ -76,7 +77,8 @@ bool is_downloaded(const char *url, enum Checksum checksum, const char *hash,
7677
}
7778
}
7879

79-
#endif /* defined(LIBACQUIRE_IMPLEMENTATION) && !defined(LIBACQUIRE_IMPL_ACQUIRE_NET_COMMON) */
80+
#endif /* defined(LIBACQUIRE_IMPLEMENTATION) && \
81+
!defined(LIBACQUIRE_IMPL_ACQUIRE_NET_COMMON) */
8082

8183
#ifdef __cplusplus
8284
}

‎acquire/acquire_string_extras.h‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,8 @@ typedef int errno_t;
105105
#include <strings.h>
106106
#endif /* HAVE_STRINGS_H */
107107

108-
#if !defined(HAVE_SNPRINTF_H) && defined(LIBACQUIRE_IMPLEMENTATION) && !defined(SNPRINTF_IMPL)
108+
#if !defined(HAVE_SNPRINTF_H) && defined(LIBACQUIRE_IMPLEMENTATION) && \
109+
!defined(SNPRINTF_IMPL)
109110
#define SNPRINTF_IMPL
110111

111112
/*
@@ -148,12 +149,12 @@ inline double wtf_vsnprintf(char *buffer, size_t count, const char *format,
148149
#define vsnprintf(buffer, count, format, args) \
149150
wtf_vsnprintf(buffer, count, format, args)
150151

151-
#endif /* !defined(HAVE_SNPRINTF_H) && defined(LIBACQUIRE_IMPLEMENTATION) && !defined(SNPRINTF_IMPL) */
152+
#endif /* !defined(HAVE_SNPRINTF_H) && defined(LIBACQUIRE_IMPLEMENTATION) && \
153+
!defined(SNPRINTF_IMPL) */
152154

153155
#ifndef HAVE_STRNCASECMP
154156

155-
extern LIBACQUIRE_EXPORT int strncasecmp(const char *, const char *,
156-
size_t);
157+
extern LIBACQUIRE_EXPORT int strncasecmp(const char *, const char *, size_t);
157158

158159
extern LIBACQUIRE_EXPORT int strcasecmp(const char *, const char *);
159160

‎acquire/tests/test_extract.h‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
#include <acquire_fileutils.h>
1717

1818
#ifdef ARCHIVE_LIB
19-
#include STR(ARCHIVE_HEADER_NAME)
19+
#include STR(ARCHIVE_HEADER_NAME)
2020
#else
21-
#error "ARCHIVE_LIB must be defined to the backend name (e.g. miniz or libarchive)"
21+
#error \
22+
"ARCHIVE_LIB must be defined to the backend name (e.g. miniz or libarchive)"
2223
#endif
2324

2425
#include <acquire_common_defs.h>
@@ -28,22 +29,22 @@
2829

2930
TEST x_test_extract_archive(void) {
3031
#define EXTRACT_DIR DOWNLOAD_DIR PATH_SEP "extract" PATH_SEP STR(ARCHIVE_LIB)
31-
puts("\"test_extract.h\" for ARCHIVE_LIB: \"" STR(ARCHIVE_LIB)
32-
"\" into EXTRACT_DIR: \"" EXTRACT_DIR "\"");
32+
puts("\"test_extract.h\" for ARCHIVE_LIB: \"" STR(
33+
ARCHIVE_LIB) "\" into EXTRACT_DIR: \"" EXTRACT_DIR "\"");
3334

34-
ASSERT_FALSE(extract_archive(LIBACQUIRE_ZIP, MINIZ_ZIP_FILE, EXTRACT_DIR) !=
35-
EXIT_SUCCESS);
35+
ASSERT_FALSE(extract_archive(LIBACQUIRE_ZIP, MINIZ_ZIP_FILE, EXTRACT_DIR) !=
36+
EXIT_SUCCESS);
3637

37-
/* Could add a comprehensive file check here */
38-
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "readme.md"));
39-
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "miniz.h"));
40-
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "miniz.c"));
41-
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "ChangeLog.md"));
42-
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "LICENSE"));
43-
ASSERT_FALSE(!is_directory(EXTRACT_DIR PATH_SEP "examples"));
38+
/* Could add a comprehensive file check here */
39+
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "readme.md"));
40+
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "miniz.h"));
41+
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "miniz.c"));
42+
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "ChangeLog.md"));
43+
ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "LICENSE"));
44+
ASSERT_FALSE(!is_directory(EXTRACT_DIR PATH_SEP "examples"));
4445

4546
#undef EXTRACT_DIR
46-
PASS();
47+
PASS();
4748
}
4849

4950
/* Suites can group multiple tests with common setup. */

0 commit comments

Comments
 (0)