Apply suggestions from code review

Co-authored-by: Tomas Cejka <[email protected]>

Author: hynekkar

output/unirec.cpp

@@ -95,9 +95,9 @@ UR_FIELDS (
  * \brief Constructor.
  */
 UnirecExporter::UnirecExporter() : m_basic_idx(-1), m_ext_cnt(0),
- m_ifc_map(nullptr),m_tmplts(nullptr), m_records(nullptr), m_ifc_cnt(0),
- m_ext_id_flgs(nullptr),m_eof(false), m_odid(false),m_link_bit_field(0),
- m_dir_bit_field(0)
+   m_ifc_map(nullptr), m_tmplts(nullptr), m_records(nullptr), m_ifc_cnt(0),
+   m_ext_id_flgs(nullptr), m_eof(false), m_odid(false), m_link_bit_field(0),
+   m_dir_bit_field(0)
 {
 }
 
@@ -363,7 +363,7 @@ int UnirecExporter::export_flow(const Flow &flow)
 
    m_flows_seen++;
    uint64_t tmplt_dbits = 0; // templates dirty bits
-   memset(m_ext_id_flgs, 0, sizeof(int)*m_ext_cnt); // in case one flow has multiple extension of same type
+   memset(m_ext_id_flgs, 0, sizeof(int) * m_ext_cnt); // in case one flow has multiple extension of same type
    int ext_processed_cnd = 0;
    while (ext != nullptr) {
       if (ext->m_ext_id >= static_cast<int>(m_ext_cnt)) {
@@ -381,11 +381,11 @@ int UnirecExporter::export_flow(const Flow &flow)
             tmplt_dbits |= (1 << ifc_num);
          }
 
-         if (m_ext_id_flgs[ext->m_ext_id] == 1){
-           //send the previously filled unirec record
-           trap_send(ifc_num, record_ptr, ur_rec_fixlen_size(tmplt_ptr) + ur_rec_varlen_size(tmplt_ptr, record_ptr));
-         }else{
-           m_ext_id_flgs[ext->m_ext_id] = 1;
+         if (m_ext_id_flgs[ext->m_ext_id] == 1) {
+            // send the previously filled unirec record
+            trap_send(ifc_num, record_ptr, ur_rec_size(tmplt_ptr, record_ptr));
+         } else {
+            m_ext_id_flgs[ext->m_ext_id] = 1;
          }
 
          fill_basic_flow(flow, tmplt_ptr, record_ptr);
@@ -394,10 +394,10 @@ int UnirecExporter::export_flow(const Flow &flow)
       ext = ext->m_next;
    }
    //send the last record with all plugin data
-   for (size_t ifc_num = 0; ifc_num < m_ifc_cnt && !(m_basic_idx >= 0) && ext_processed_cnd > 0; ifc_num++){
-     tmplt_ptr = m_tmplts[ifc_num];
-     record_ptr = m_records[ifc_num];
-     trap_send(ifc_num, record_ptr, ur_rec_fixlen_size(tmplt_ptr) + ur_rec_varlen_size(tmplt_ptr, record_ptr));
+   for (size_t ifc_num = 0; ifc_num < m_ifc_cnt && !(m_basic_idx >= 0) && ext_processed_cnd > 0; ifc_num++) {
+      tmplt_ptr = m_tmplts[ifc_num];
+      record_ptr = m_records[ifc_num];
+      trap_send(ifc_num, record_ptr, ur_rec_size(tmplt_ptr, record_ptr));
    }
    return 0;
 }