xcode analyzer cleanup

diff --git a/src/codecs/ip/cd_icmp6.cc b/src/codecs/ip/cd_icmp6.cc
index 9b623053e70e53e824a21a1552adcded663141c6..2423f1bfcc7cf5fb723ccc2d84e40393a00eaaf4 100644 (file)
--- a/src/codecs/ip/cd_icmp6.cc
+++ b/src/codecs/ip/cd_icmp6.cc
@@ -327,8 +327,8 @@ void Icmp6Codec::update(const ip::IpApi& api, const EncodeFlags flags,
         checksum::Pseudoheader6 ps6;
         h->cksum = 0;
 
-        memcpy(ps6.sip, &api.get_src()->ip32, sizeof(ps6.sip));
-        memcpy(ps6.dip, &api.get_dst()->ip32, sizeof(ps6.dip));
+        memcpy(ps6.sip, api.get_src()->ip32, sizeof(ps6.sip));
+        memcpy(ps6.dip, api.get_dst()->ip32, sizeof(ps6.dip));
         ps6.zero = 0;
         ps6.protocol = IPPROTO_ICMPV6;
         ps6.len = htons((uint16_t)updated_len);

diff --git a/src/codecs/ip/cd_udp.cc b/src/codecs/ip/cd_udp.cc
index 41587b31e907b8bcaa5c280981389587c74fa1ea..a3138d5aa952a81b71428207db49d38ee34e2a28 100644 (file)
--- a/src/codecs/ip/cd_udp.cc
+++ b/src/codecs/ip/cd_udp.cc
@@ -430,8 +430,8 @@ void UdpCodec::update(const ip::IpApi& ip_api, const EncodeFlags flags,
         {
             checksum::Pseudoheader6 ps6;
             const ip::IP6Hdr* const ip6h = ip_api.get_ip6h();
-            memcpy(ps6.sip, &ip6h->ip6_src.u6_addr32, sizeof(ps6.sip));
-            memcpy(ps6.dip, &ip6h->ip6_dst.u6_addr32, sizeof(ps6.dip));
+            memcpy(ps6.sip, ip6h->ip6_src.u6_addr32, sizeof(ps6.sip));
+            memcpy(ps6.dip, ip6h->ip6_dst.u6_addr32, sizeof(ps6.dip));
             ps6.zero = 0;
             ps6.protocol = IPPROTO_ID_UDP;
             ps6.len = htons((uint16_t)updated_len);

diff --git a/src/file_api/file_service.cc b/src/file_api/file_service.cc
index 77067c5ce5712eb3fd683c123d8e9da4d336e478..f1ee69b44bb88ef0aaba266f69987b16441a1cb1 100644 (file)
--- a/src/file_api/file_service.cc
+++ b/src/file_api/file_service.cc
@@ -354,7 +354,6 @@ FileContext* create_file_context(Flow* flow)
     if (!file_session)
     {
         FileFlowData* ffd = new FileFlowData;
-        file_session = &ffd->session;
         flow->set_application_data(ffd);
     }
 

diff --git a/src/file_api/file_stats.cc b/src/file_api/file_stats.cc
index 7c21d63f0fd4546cb073da27b4cc86aacec2598d..0be75c8d681b353b16137d42b152927a7082be82 100644 (file)
--- a/src/file_api/file_stats.cc
+++ b/src/file_api/file_stats.cc
@@ -90,10 +90,8 @@ void printFileContext(FileContext* context)
 
     if (unused > 0)
     {
-        used = snprintf(cur, unused, "\nProcessed size: %u\n",
+        snprintf(cur, unused, "\nProcessed size: %u\n",
             (unsigned int)context->processed_bytes);
-        unused -= used;
-        cur += used;
     }
 
     buf[sizeof(buf) - 1] = '\0';

diff --git a/src/flow/flow_key.cc b/src/flow/flow_key.cc
index 42ef0fe8d921b6c9e8473b63029a65231880138e..8bfea41ed40fc92f5ddc78d5a4c0622fc352d045 100644 (file)
--- a/src/flow/flow_key.cc
+++ b/src/flow/flow_key.cc
@@ -201,7 +201,7 @@ void FlowKey::init_mpls(uint32_t mplsId)
 }
 
 void FlowKey::init(
-    uint8_t type, uint8_t proto, 
+    uint8_t type, uint8_t proto,
     const sfip_t *srcIP, uint16_t srcPort,
     const sfip_t *dstIP, uint16_t dstPort,
     uint16_t vlanId, uint32_t mplsId, uint16_t addrSpaceId)

diff --git a/src/log/log_text.cc b/src/log/log_text.cc
index a98a781b280fff4d7fc5568860ff865632a85e31..9fa5876302c69b550ad8fccb3cec59d477487259 100644 (file)
--- a/src/log/log_text.cc
+++ b/src/log/log_text.cc
@@ -1514,14 +1514,14 @@ static void LogCharData(TextLog* log, char* data, int len)
  *
  * Returns: void function
  */
-#define SEPARATOR \
-          "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
+static const char SEPARATOR[] =
+          "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -";
 
 #define BYTES_PER_FRAME 20
 /* middle:"41 02 43 04 45 06 47 08 49 0A 4B 0C 4D 0E 4F 0F 01 02 03 04  A.C.E.G.I.K.M.O....."
    at end:"41 02 43 04 45 06 47 08                                      A.C.E.G."*/
 
-static const char pad3[] =
+static const char PAD3[] =
           "                                                             ";
 
 void LogNetData(TextLog* log, const uint8_t* data, const int len, Packet* p)
@@ -1607,7 +1607,7 @@ void LogNetData(TextLog* log, const uint8_t* data, const int len, Packet* p)
             }
         }
         /* print ' ' past end of packet and before ascii */
-        TextLog_Puts(log, pad3+(3*i));
+        TextLog_Puts(log, PAD3+(3*i));
 
         /* then print the actual ascii chars
            or a '.' for control chars */

diff --git a/src/log/obfuscation.cc b/src/log/obfuscation.cc
index d60baa18361c72acac000d0fe50fee858c2120cf..4aee77d7133b3d38b2d9058c57436d6655008f74 100644 (file)
--- a/src/log/obfuscation.cc
+++ b/src/log/obfuscation.cc
@@ -105,23 +105,13 @@ static THREAD_LOCAL ObfuscationStruct ob_struct;
 /*******************************************************************************
  * Private function prototypes
  ******************************************************************************/
-static inline int NumObfuscateMaxLenEntries(void);
-static inline int NumObfuscateSliceEntries(void);
-static inline ObRet ObfuscationEntryOverflow(ob_size_t);
 static inline int PayloadObfuscationRequired(Packet*);
 
-static inline void SetObfuscationEntry(ObfuscationEntry*, Packet*,
-    ob_size_t, ob_size_t, ob_char_t);
-
 static inline void SortObfuscationEntries(void);
 
 static inline void SetObfuscationCallbackData(
     ObfuscationCallbackData*, Packet*, ObfuscationCallback, void*);
 
-static inline void SetObfuscationStreamCallbackData(
-    ObfuscationStreamCallbackData*, ObfuscationCallbackData*,
-    Packet*, ObfuscationCallback, void*);
-
 static ObRet AddObfuscationEntry(Packet*, ob_size_t, ob_size_t, ob_char_t);
 static int ObfuscationEntrySort(const void*, const void*);
 
@@ -129,7 +119,8 @@ static ObRet TraverseObfuscationList(ObfuscationCallbackData*,
     const DAQ_PktHdr_t*, const uint8_t*, ob_size_t);
 
 static ObRet GetObfuscatedPayloadCallback(const DAQ_PktHdr_t*,
-const uint8_t*, ob_size_t, ob_char_t, void*);
+    const uint8_t*, ob_size_t, ob_char_t, void*);
+
 static void PrintObfuscationEntry(const ObfuscationEntry*, int);
 
 /*******************************************************************************
@@ -477,6 +468,7 @@ static inline void SetObfuscationCallbackData(
  *  None
  *
  ******************************************************************************/
+#if 0
 static inline void SetObfuscationStreamCallbackData(
     ObfuscationStreamCallbackData* stream_callback_data,
     ObfuscationCallbackData* callback_data, Packet* packet,
@@ -490,6 +482,7 @@ static inline void SetObfuscationStreamCallbackData(
     stream_callback_data->next_seq = 0;
     stream_callback_data->last_entry_index = 0;
 }
+#endif
 
 /*******************************************************************************
  * Function: SortObfuscationEntries()

diff --git a/src/network_inspectors/binder/bind_module.cc b/src/network_inspectors/binder/bind_module.cc
index bb14af188f498fad88b93865d8f98323502c4032..fe88b872b8543ec340d36a2f748d4a967dc065a0 100644 (file)
--- a/src/network_inspectors/binder/bind_module.cc
+++ b/src/network_inspectors/binder/bind_module.cc
@@ -151,7 +151,7 @@ bool BinderModule::set(const char* fqn, Value& v, SnortConfig*)
     else if ( v.is("proto") )
     {
         const PktType mask[] =
-        { 
+        {
             PktType::ANY, PktType::IP, PktType::ICMP, PktType::TCP, PktType::UDP,
             PktType::USER, PktType::FILE
         };

diff --git a/src/stream/file/stream_file.cc b/src/stream/file/stream_file.cc
index 6d040e5687241b599ac5b59c71e8fdf362f31449..69786e995feafbba9e7b65944fce48c507ec1bf2 100644 (file)
--- a/src/stream/file/stream_file.cc
+++ b/src/stream/file/stream_file.cc
@@ -55,8 +55,8 @@ StreamFileConfig* get_file_cfg(Inspector* ins)
 {
     assert(ins);
     return &((StreamFile*)ins)->config;
-}       
-        
+}
+
 //-------------------------------------------------------------------------
 // api stuff
 //-------------------------------------------------------------------------

diff --git a/src/stream/tcp/tcp_session.cc b/src/stream/tcp/tcp_session.cc
index 527242f4fbb2efa8f19673aba6b2fb597db069b5..8fb974480ff13892812d3659ab780ceafd1b6846 100644 (file)
--- a/src/stream/tcp/tcp_session.cc
+++ b/src/stream/tcp/tcp_session.cc
@@ -1195,6 +1195,9 @@ static inline void GetPacketHeaderFoo(
         pkth->egress_index = tcpssn->ingress_index;
         pkth->egress_group = tcpssn->ingress_group;
     }
+#ifdef HAVE_DAQ_ADDRESS_SPACE_ID
+    pkth->opaque = 0;
+#endif
     pkth->flags = tcpssn->daq_flags;
     pkth->address_space_id = tcpssn->address_space_id;
 }