aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

src: remove unneeded double colon

Browse Source 
git grep ';;' src/ | grep -v for | cut -d: -f1 | uniq
| while read f; do sed -i -e 's/;;/;/' $f; done
pull/8360/head
Philippe Antoine 2 years ago committed by Victor Julien
parent cb89192ec3
commit 9f21e2bcde
12 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File

28
src/decode-icmpv4.c
Unescape Escape View File

@ -405,8 +405,8 @@ static int DecodeICMPV4test01(void)
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");
ip4h.s_ip_src.s_addr = p->src.addr_data32[0];
ip4h.s_ip_dst.s_addr = p->dst.addr_data32[0];
@ -455,8 +455,8 @@ static int DecodeICMPV4test02(void)
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");
ip4h.s_ip_src.s_addr = p->src.addr_data32[0];
ip4h.s_ip_dst.s_addr = p->dst.addr_data32[0];
@ -503,8 +503,8 @@ static int DecodeICMPV4test03(void)
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");
ip4h.s_ip_src.s_addr = p->src.addr_data32[0];
ip4h.s_ip_dst.s_addr = p->dst.addr_data32[0];
@ -582,8 +582,8 @@ static int DecodeICMPV4test04(void)
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");
ip4h.s_ip_src.s_addr = p->src.addr_data32[0];
ip4h.s_ip_dst.s_addr = p->dst.addr_data32[0];
@ -651,8 +651,8 @@ static int DecodeICMPV4test05(void)
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");
ip4h.s_ip_src.s_addr = p->src.addr_data32[0];
ip4h.s_ip_dst.s_addr = p->dst.addr_data32[0];
@ -757,8 +757,8 @@ static int ICMPV4InvalidType07(void)
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");
ip4h.s_ip_src.s_addr = p->src.addr_data32[0];
ip4h.s_ip_dst.s_addr = p->dst.addr_data32[0];
@ -800,8 +800,8 @@ static int DecodeICMPV4test08(void)
p->src.family = AF_INET;
p->dst.family = AF_INET;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");;
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");;
p->src.addr_data32[0] = UTHSetIPv4Address("4.3.2.1");
p->dst.addr_data32[0] = UTHSetIPv4Address("1.2.3.4");
ip4h.s_ip_src.s_addr = p->src.addr_data32[0];
ip4h.s_ip_dst.s_addr = p->dst.addr_data32[0];

2
src/detect-fragoffset.c
Unescape Escape View File

@ -127,7 +127,7 @@ static int DetectFragOffsetMatch (DetectEngineThreadCtx *det_ctx,
return 0;
}
return FragOffsetMatch(frag, fragoff->mode, fragoff->frag_off);;
return FragOffsetMatch(frag, fragoff->mode, fragoff->frag_off);
}
/**

2
src/detect-nocase.c
Unescape Escape View File

@ -75,7 +75,7 @@ static int DetectNocaseSetup (DetectEngineCtx *de_ctx, Signature *s, const char
}
/* verify other conditions. */
DetectContentData *cd = (DetectContentData *)pm->ctx;;
DetectContentData *cd = (DetectContentData *)pm->ctx;
if (cd->flags & DETECT_CONTENT_NOCASE) {
SCLogError("can't use multiple nocase modifiers with the same content");

2
src/detect-parse.c
Unescape Escape View File

@ -2380,7 +2380,7 @@ static inline int DetectEngineSignatureIsDuplicate(DetectEngineCtx *de_ctx,
if (sw_temp.s != NULL) {
sw_next = HashListTableLookup(de_ctx->dup_sig_hash_table,
(void *)&sw_temp, 0);
sw_next->s_prev = sw_dup->s_prev;;
sw_next->s_prev = sw_dup->s_prev;
}
SigFree(de_ctx, sw_dup->s);
}

2
src/detect-tls-cert-validity.c
Unescape Escape View File

@ -269,7 +269,7 @@ static time_t DateStringToEpoch (char *string)
time_t epoch = StringIsEpoch(string);
if (epoch != -1) {
return epoch;;
return epoch;
}
r = SCStringPatternToTime(string, patterns, 10, &tm);

4
src/output-json-alert.c
Unescape Escape View File

@ -682,8 +682,8 @@ static int AlertJson(ThreadVars *tv, JsonAlertLogThread *aft, const Packet *p)
JsonAddrInfoInit(p, LOG_DIR_PACKET, &addr);
/* Check for XFF, overwriting address info if needed. */
HttpXFFCfg *xff_cfg = json_output_ctx->xff_cfg != NULL ?
json_output_ctx->xff_cfg : json_output_ctx->parent_xff_cfg;;
HttpXFFCfg *xff_cfg = json_output_ctx->xff_cfg != NULL ? json_output_ctx->xff_cfg
: json_output_ctx->parent_xff_cfg;
int have_xff_ip = 0;
char xff_buffer[XFF_MAXLEN];
xff_buffer[0] = 0;

4
src/output-json-file.c
Unescape Escape View File

@ -204,8 +204,8 @@ JsonBuilder *JsonBuildFileInfoRecord(const Packet *p, const File *ff, void *tx,
static void FileWriteJsonRecord(JsonFileLogThread *aft, const Packet *p, const File *ff, void *tx,
const uint64_t tx_id, uint8_t dir, OutputJsonCtx *eve_ctx)
{
HttpXFFCfg *xff_cfg = aft->filelog_ctx->xff_cfg != NULL ?
aft->filelog_ctx->xff_cfg : aft->filelog_ctx->parent_xff_cfg;;
HttpXFFCfg *xff_cfg = aft->filelog_ctx->xff_cfg != NULL ? aft->filelog_ctx->xff_cfg
: aft->filelog_ctx->parent_xff_cfg;
JsonBuilder *js = JsonBuildFileInfoRecord(
p, ff, tx, tx_id, ff->flags & FILE_STORED ? true : false, dir, xff_cfg, eve_ctx);
if (unlikely(js == NULL)) {

4
src/tests/detect.c
Unescape Escape View File

@ -2194,7 +2194,7 @@ static int SigTest28TCPV6Keyword(void)
p2->tcph = (TCPHdr *) (invalid_raw_ipv6 + 54);
p2->src.family = AF_INET;
p2->dst.family = AF_INET;
p2->payload = invalid_raw_ipv6 + 54 + 20;;
p2->payload = invalid_raw_ipv6 + 54 + 20;
p2->payload_len = 12;
p2->proto = IPPROTO_TCP;
@ -2320,7 +2320,7 @@ static int SigTest29NegativeTCPV6Keyword(void)
p2->tcph = (TCPHdr *) (invalid_raw_ipv6 + 54);
p2->src.family = AF_INET;
p2->dst.family = AF_INET;
p2->payload = invalid_raw_ipv6 + 54 + 20;;
p2->payload = invalid_raw_ipv6 + 54 + 20;
p2->payload_len = 12;
p2->proto = IPPROTO_TCP;

2
src/tm-modules.c
Unescape Escape View File

@ -75,7 +75,7 @@ int TmModuleGetIdByName(const char *name)
{
TmModule *tm = TmModuleGetByName(name);
if (tm == NULL)
return -1;;
return -1;
return TmModuleGetIDForTM(tm);
}

2
src/util-macset.c
Unescape Escape View File

@ -119,7 +119,7 @@ static inline void MacUpdateEntry(MacSet *ms, uint8_t *addr, int side, ThreadVar
{
switch (ms->state[side]) {
case EMPTY_SET:
memcpy(ms->singles[side], addr, sizeof(MacAddr));;
memcpy(ms->singles[side], addr, sizeof(MacAddr));
ms->state[side] = SINGLE_MAC;
if (tv != NULL)
StatsSetUI64(tv, ctr, 1);

6
src/util-mpm-ac-bs.c
Unescape Escape View File

@ -1163,7 +1163,7 @@ uint32_t SCACBSSearch(const MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
ascii_codes = state_table_mod_pointers[state & 0x7FFF] + 1;
buf_local = u8_tolower(buf[i]);
if (buf_local == ascii_codes[0]) {
state = *(ascii_codes + no_of_entries);;
state = *(ascii_codes + no_of_entries);
} else {
state = zero_state[buf_local];
}
@ -1246,9 +1246,9 @@ uint32_t SCACBSSearch(const MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
ascii_codes = state_table_mod_pointers[state & 0x00FFFFFF] + 1;
buf_local = u8_tolower(buf[i]);
if (buf_local == ascii_codes[0]) {
state = *(ascii_codes + no_of_entries);;
state = *(ascii_codes + no_of_entries);
} else {
state = zero_state[buf_local];;
state = zero_state[buf_local];
}
} else {
if (no_of_entries == 0) {

2
src/util-mpm-ac.c
Unescape Escape View File

@ -217,7 +217,7 @@ static void SCACShrinkState(SCACCtx *ctx)
static inline int SCACInitNewState(MpmCtx *mpm_ctx)
{
SCACCtx *ctx = (SCACCtx *)mpm_ctx->ctx;;
SCACCtx *ctx = (SCACCtx *)mpm_ctx->ctx;
/* Exponentially increase the allocated space when needed. */
if (ctx->allocated_state_count < ctx->state_count + 1) {

Write Preview
Loading…
Cancel
Save