mirror of
https://github.com/Cisco-Talos/clamav.git
synced 2025-10-19 10:23:17 +00:00
Auto-format with clang-format
This commit is contained in:
parent
8d485b9bfd
commit
272e84eaa8
4 changed files with 10 additions and 6 deletions
|
@ -1054,7 +1054,8 @@ struct optstruct *optparse(const char *cfgfile, int argc, char **argv, int verbo
|
||||||
break;
|
break;
|
||||||
|
|
||||||
buff = buffer;
|
buff = buffer;
|
||||||
for (i = 0; i < (int)strlen(buff) - 1 && (buff[i] == ' ' || buff[i] == '\t'); i++);
|
for (i = 0; i < (int)strlen(buff) - 1 && (buff[i] == ' ' || buff[i] == '\t'); i++)
|
||||||
|
;
|
||||||
buff += i;
|
buff += i;
|
||||||
line++;
|
line++;
|
||||||
if (strlen(buff) <= 2 || buff[0] == '#')
|
if (strlen(buff) <= 2 || buff[0] == '#')
|
||||||
|
@ -1075,9 +1076,11 @@ struct optstruct *optparse(const char *cfgfile, int argc, char **argv, int verbo
|
||||||
}
|
}
|
||||||
name = buff;
|
name = buff;
|
||||||
*pt++ = 0;
|
*pt++ = 0;
|
||||||
for (i = 0; i < (int)strlen(pt) - 1 && (pt[i] == ' ' || pt[i] == '\t'); i++);
|
for (i = 0; i < (int)strlen(pt) - 1 && (pt[i] == ' ' || pt[i] == '\t'); i++)
|
||||||
|
;
|
||||||
pt += i;
|
pt += i;
|
||||||
for (i = strlen(pt); i >= 1 && (pt[i - 1] == ' ' || pt[i - 1] == '\t' || pt[i - 1] == '\n'); i--);
|
for (i = strlen(pt); i >= 1 && (pt[i - 1] == ' ' || pt[i - 1] == '\t' || pt[i - 1] == '\n'); i--)
|
||||||
|
;
|
||||||
if (!i) {
|
if (!i) {
|
||||||
if (verbose)
|
if (verbose)
|
||||||
fprintf(stderr, "ERROR: Missing argument for option at %s:%d\n", cfgfile, line);
|
fprintf(stderr, "ERROR: Missing argument for option at %s:%d\n", cfgfile, line);
|
||||||
|
|
|
@ -394,7 +394,8 @@ struct cl_cvd *cl_cvdhead(const char *file)
|
||||||
if ((pt = strpbrk(head, "\n\r")))
|
if ((pt = strpbrk(head, "\n\r")))
|
||||||
*pt = 0;
|
*pt = 0;
|
||||||
|
|
||||||
for (i = bread - 1; i > 0 && (head[i] == ' ' || head[i] == '\n' || head[i] == '\r'); head[i] = 0, i--);
|
for (i = bread - 1; i > 0 && (head[i] == ' ' || head[i] == '\n' || head[i] == '\r'); head[i] = 0, i--)
|
||||||
|
;
|
||||||
|
|
||||||
return cl_cvdparse(head);
|
return cl_cvdparse(head);
|
||||||
}
|
}
|
||||||
|
|
|
@ -222,7 +222,7 @@ static void *load_module(const char *name, const char *featurename)
|
||||||
#ifdef _AIX
|
#ifdef _AIX
|
||||||
snprintf(modulename, sizeof(modulename),
|
snprintf(modulename, sizeof(modulename),
|
||||||
"%s%s(%s%s.%d)",
|
"%s%s(%s%s.%d)",
|
||||||
name,".a",name,LT_MODULE_EXT,LIBCLAMAV_MAJORVER);
|
name, ".a", name, LT_MODULE_EXT, LIBCLAMAV_MAJORVER);
|
||||||
#else
|
#else
|
||||||
snprintf(modulename, sizeof(modulename),
|
snprintf(modulename, sizeof(modulename),
|
||||||
"%s" PATHSEP "%s%s",
|
"%s" PATHSEP "%s%s",
|
||||||
|
|
|
@ -327,7 +327,7 @@ pub unsafe extern "C" fn codesign_verifier_new(
|
||||||
verifier: *mut *mut c_void,
|
verifier: *mut *mut c_void,
|
||||||
err: *mut *mut FFIError,
|
err: *mut *mut FFIError,
|
||||||
) -> bool {
|
) -> bool {
|
||||||
let certs_directory_str = validate_str_param!(certs_directory_str, err=err);
|
let certs_directory_str = validate_str_param!(certs_directory_str, err = err);
|
||||||
let certs_directory = match Path::new(certs_directory_str).canonicalize() {
|
let certs_directory = match Path::new(certs_directory_str).canonicalize() {
|
||||||
Ok(p) => p,
|
Ok(p) => p,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue