Move initialization of RandTest members to header

This commit is contained in:
Tim Wojtulewicz 2025-06-06 09:08:44 -07:00
parent 359ab18bf7
commit b22caa812d
2 changed files with 17 additions and 17 deletions

View file

@ -29,16 +29,6 @@ constexpr double RT_INCIRC = 281474943156225.0;
namespace zeek::detail { namespace zeek::detail {
RandTest::RandTest() {
totalc = 0;
mp = 0;
sccfirst = 1;
inmont = mcount = 0;
cexp = montex = montey = montepi = sccu0 = scclast = scct1 = scct2 = scct3 = 0.0;
memset(ccount, 0, sizeof(ccount));
}
void RandTest::add(const void* buf, int bufl) { void RandTest::add(const void* buf, int bufl) {
const unsigned char* bp = static_cast<const unsigned char*>(buf); const unsigned char* bp = static_cast<const unsigned char*>(buf);
int oc; int oc;

View file

@ -16,20 +16,30 @@ namespace detail {
class RandTest { class RandTest {
public: public:
RandTest();
void add(const void* buf, int bufl); void add(const void* buf, int bufl);
void end(double* r_ent, double* r_chisq, double* r_mean, double* r_montepicalc, double* r_scc); void end(double* r_ent, double* r_chisq, double* r_mean, double* r_montepicalc, double* r_scc);
private: private:
friend class zeek::EntropyVal; friend class zeek::EntropyVal;
int64_t ccount[256]; /* Bins to count occurrences of values */ int64_t ccount[256] = {0}; /* Bins to count occurrences of values */
int64_t totalc; /* Total bytes counted */ int64_t totalc = 0; /* Total bytes counted */
int mp; int mp = 0;
int sccfirst; int sccfirst = 1;
unsigned int monte[RT_MONTEN] = {0}; unsigned int monte[RT_MONTEN] = {0};
int64_t inmont, mcount;
double cexp, montex, montey, montepi, sccu0, scclast, scct1, scct2, scct3; int64_t inmont = 0;
int64_t mcount = 0;
double cexp = 0.0;
double montex = 0.0;
double montey = 0.0;
double montepi = 0.0;
double sccu0 = 0.0;
double scclast = 0.0;
double scct1 = 0.0;
double scct2 = 0.0;
double scct3 = 0.0;
}; };
} // namespace detail } // namespace detail