mirror of
https://github.com/zeek/zeek.git
synced 2025-10-08 17:48:21 +00:00
Merge remote-tracking branch 'origin/topic/jsiwek/compiler-warnings'
* origin/topic/jsiwek/compiler-warnings: Fixing compiler warnings (addresses #388)
This commit is contained in:
commit
3b1f13b861
17 changed files with 82 additions and 75 deletions
|
@ -85,8 +85,8 @@ void OSFingerprint::collide(uint32 id)
|
|||
if (sig[id].ttl % 32 && sig[id].ttl != 255 && sig[id].ttl % 30)
|
||||
{
|
||||
problems=1;
|
||||
reporter->Warning(fmt("OS fingerprinting: [!] Unusual TTL (%d) for signature '%s %s' (line %d).",
|
||||
sig[id].ttl,sig[id].os,sig[id].desc,sig[id].line));
|
||||
reporter->Warning("OS fingerprinting: [!] Unusual TTL (%d) for signature '%s %s' (line %d).",
|
||||
sig[id].ttl,sig[id].os,sig[id].desc,sig[id].line);
|
||||
}
|
||||
|
||||
for (i=0;i<id;i++)
|
||||
|
@ -94,8 +94,8 @@ void OSFingerprint::collide(uint32 id)
|
|||
if (!strcmp(sig[i].os,sig[id].os) &&
|
||||
!strcmp(sig[i].desc,sig[id].desc)) {
|
||||
problems=1;
|
||||
reporter->Warning(fmt("OS fingerprinting: [!] Duplicate signature name: '%s %s' (line %d and %d).",
|
||||
sig[i].os,sig[i].desc,sig[i].line,sig[id].line));
|
||||
reporter->Warning("OS fingerprinting: [!] Duplicate signature name: '%s %s' (line %d and %d).",
|
||||
sig[i].os,sig[i].desc,sig[i].line,sig[id].line);
|
||||
}
|
||||
|
||||
/* If TTLs are sufficiently away from each other, the risk of
|
||||
|
@ -277,10 +277,10 @@ do_const:
|
|||
if (sig[id].opt[j] ^ sig[i].opt[j]) goto reloop;
|
||||
|
||||
problems=1;
|
||||
reporter->Warning(fmt("OS fingerprinting: [!] Signature '%s %s' (line %d)\n"
|
||||
reporter->Warning("OS fingerprinting: [!] Signature '%s %s' (line %d)\n"
|
||||
" is already covered by '%s %s' (line %d).",
|
||||
sig[id].os,sig[id].desc,sig[id].line,sig[i].os,sig[i].desc,
|
||||
sig[i].line));
|
||||
sig[i].line);
|
||||
|
||||
reloop:
|
||||
;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue