github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-06-28 16:41:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

fdr: move fdrSize into namespace ue2 (build only)

Browse Source
This commit is contained in:
Justin Viiret 2016-04-27 15:50:16 +10:00 committed by Matthew Barr
parent 9fa11b48b0
commit 353f0b4da2
5 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fdr/fdr.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Intel Corporation * Copyright (c) 2015-2016, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -43,9 +43,6 @@ extern "C" {
struct FDR; struct FDR;
/** \brief Returns size in bytes of the given FDR engine. */
size_t fdrSize(const struct FDR *fdr);
/** \brief Returns non-zero if the contents of the stream state indicate that /** \brief Returns non-zero if the contents of the stream state indicate that
* there is active FDR history beyond the regularly used history. */ * there is active FDR history beyond the regularly used history. */
u32 fdrStreamStateActive(const struct FDR *fdr, const u8 *stream_state); u32 fdrStreamStateActive(const struct FDR *fdr, const u8 *stream_state);

7
src/fdr/fdr_compile.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Intel Corporation * Copyright (c) 2015-2016, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -571,10 +571,9 @@ fdrBuildTableHinted(const vector<hwlmLiteral> &lits, bool make_small, u32 hint,
#endif #endif
} // namespace ue2
// FIXME: should be compile-time only
size_t fdrSize(const FDR *fdr) { size_t fdrSize(const FDR *fdr) {
assert(fdr); assert(fdr);
return fdr->size; return fdr->size;
} }
} // namespace ue2

5
src/fdr/fdr_compile.h
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Intel Corporation * Copyright (c) 2015-2016, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -61,6 +61,9 @@ fdrBuildTableHinted(const std::vector<hwlmLiteral> &lits, bool make_small,
#endif #endif
/** \brief Returns size in bytes of the given FDR engine. */
size_t fdrSize(const struct FDR *fdr);
} // namespace ue2 } // namespace ue2
#endif #endif

6
src/fdr/fdr_dump.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2015, Intel Corporation * Copyright (c) 2015-2016, Intel Corporation
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met: * modification, are permitted provided that the following conditions are met:
@ -28,11 +28,11 @@
#include "config.h" #include "config.h"
#include "fdr.h" #include "fdr_compile.h"
#include "fdr_internal.h"
#include "fdr_compile_internal.h" #include "fdr_compile_internal.h"
#include "fdr_dump.h" #include "fdr_dump.h"
#include "fdr_engine_description.h" #include "fdr_engine_description.h"
#include "fdr_internal.h"
#include "teddy_engine_description.h" #include "teddy_engine_description.h"
#include "ue2common.h" #include "ue2common.h"

1
src/hwlm/hwlm_build.cpp
View File

@ -37,7 +37,6 @@
#include "noodle_build.h" #include "noodle_build.h"
#include "ue2common.h" #include "ue2common.h"
#include "fdr/fdr_compile.h" #include "fdr/fdr_compile.h"
#include "fdr/fdr.h"
#include "nfa/shufticompile.h" #include "nfa/shufticompile.h"
#include "util/alloc.h" #include "util/alloc.h"
#include "util/bitutils.h" #include "util/bitutils.h"