Skip to content

Commit 846f128

Browse files
committed
Auto-format touch-up
1 parent a550e79 commit 846f128

4 files changed

Lines changed: 12 additions & 13 deletions

File tree

libclamav/clamav.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2087,10 +2087,10 @@ extern const char *cl_strerror(cl_error_t clerror);
20872087
* If this flag is set, the function will allocate a buffer for the hash and return it. \
20882088
* The caller is responsible for freeing the buffer using free(). \
20892089
* If this flag is not set, the caller must provide a buffer to store the hash. */
2090-
#define CL_HASH_FLAG_FIPS_BYPASS 0x02 /* Use CL_HASH_FLAG_FIPS_BYPASS to bypass FIPS restrictions on which algorithms can be \
2091-
* used. This is useful if you want to use algorithms that are not FIPS-approved. \
2092-
* For example, you might want to use this flag if you want to use "md5" or "sha1". \
2093-
* You should only do this when the hash is used for non-cryptographic purposes. \
2090+
#define CL_HASH_FLAG_FIPS_BYPASS 0x02 /* Use CL_HASH_FLAG_FIPS_BYPASS to bypass FIPS restrictions on which algorithms can be \
2091+
* used. This is useful if you want to use algorithms that are not FIPS-approved. \
2092+
* For example, you might want to use this flag if you want to use "md5" or "sha1". \
2093+
* You should only do this when the hash is used for non-cryptographic purposes. \
20942094
* Note: If OpenSSL's FIPS provider is not available, this flag has no effect. */
20952095

20962096
/**

libclamav/matcher-hash-types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ size_t cli_hash_len(cli_hash_type_t type);
5656
* @param name The name of the hash type.
5757
* @return cli_hash_type_t The hash type.
5858
*/
59-
cl_error_t cli_hash_type_from_name(const char* name, cli_hash_type_t *type_out);
59+
cl_error_t cli_hash_type_from_name(const char* name, cli_hash_type_t* type_out);
6060

6161
#define CLI_HASHLEN_MAX SHA256_HASH_SIZE
6262

libclamav/scan_layer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ typedef struct cli_scan_layer {
3535
cli_file_t type;
3636
size_t size;
3737
cl_fmap_t *fmap; /* The fmap for this layer. This used to be in an array in the ctx. */
38-
uint32_t recursion_level; /* The recursion level of this layer in the scan stack. */
38+
uint32_t recursion_level; /* The recursion level of this layer in the scan stack. */
3939
uint32_t recursion_level_buffer; /* Which buffer layer in scan recursion. */
4040
uint32_t recursion_level_buffer_fmap; /* Which fmap layer in this buffer. */
4141
uint32_t attributes; /* layer attributes. */

libclamav_rust/src/evidence.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,14 +368,10 @@ pub unsafe extern "C" fn _evidence_remove_indicator(
368368

369369
rrf_call!(
370370
err = err,
371-
evidence.remove_indicator(
372-
name_str,
373-
indicator_type
374-
)
371+
evidence.remove_indicator(name_str, indicator_type)
375372
)
376373
}
377374

378-
379375
impl Evidence {
380376
/// Check if we have any indicators that should alert the user.
381377
pub fn render_verdict(&self) -> bool {
@@ -440,7 +436,11 @@ impl Evidence {
440436
}
441437

442438
/// Add evidence from a child layer to this evidence instance.
443-
pub fn add_child_evidence(&mut self, child: &Evidence, from_normalized: bool) -> Result<(), Error> {
439+
pub fn add_child_evidence(
440+
&mut self,
441+
child: &Evidence,
442+
from_normalized: bool,
443+
) -> Result<(), Error> {
444444
if child.strong.is_empty() && child.pua.is_empty() && child.weak.is_empty() {
445445
return Err(Error::InvalidParameter(
446446
"Child evidence must contain at least one indicator".to_string(),
@@ -529,5 +529,4 @@ impl Evidence {
529529

530530
Ok(())
531531
}
532-
533532
}

0 commit comments

Comments
 (0)