Moving inline functions to the .h files, so gcc can inline them correctly

remotes/origin/master-1.0.x
Pablo Rincon 16 years ago committed by Victor Julien
parent d94d929b04
commit 3047135817

@ -62,7 +62,7 @@ char *SCThresholdConfGetConfFilename(void)
* \retval 0 On success. * \retval 0 On success.
* \retval -1 On failure. * \retval -1 On failure.
*/ */
inline int SCThresholdConfInitContext(DetectEngineCtx *de_ctx, FILE *utfd) int SCThresholdConfInitContext(DetectEngineCtx *de_ctx, FILE *utfd)
{ {
char *filename = NULL; char *filename = NULL;
const char *eb = NULL; const char *eb = NULL;
@ -124,7 +124,7 @@ void SCThresholdConfDeInitContext(DetectEngineCtx *de_ctx, FILE *fd)
* \retval 0 On success. * \retval 0 On success.
* \retval -1 On failure. * \retval -1 On failure.
*/ */
inline int SCThresholdConfAddThresholdtype(char *rawstr, DetectEngineCtx *de_ctx) int SCThresholdConfAddThresholdtype(char *rawstr, DetectEngineCtx *de_ctx)
{ {
const char *th_gid = NULL; const char *th_gid = NULL;
const char *th_sid = NULL; const char *th_sid = NULL;
@ -409,7 +409,7 @@ int SCThresholdConfIsLineBlankOrComment(char *line)
* \param de_ctx Pointer to the Detection Engine Context. * \param de_ctx Pointer to the Detection Engine Context.
* \param fd Pointer to file descriptor. * \param fd Pointer to file descriptor.
*/ */
inline void SCThresholdConfParseFile(DetectEngineCtx *de_ctx, FILE *fd) void SCThresholdConfParseFile(DetectEngineCtx *de_ctx, FILE *fd)
{ {
char line[1024]; char line[1024];

@ -6,8 +6,8 @@
#define __UTIL_THRESHOLD_CONFIG_H__ #define __UTIL_THRESHOLD_CONFIG_H__
void SCThresholdConfDeInitContext(DetectEngineCtx *, FILE *); void SCThresholdConfDeInitContext(DetectEngineCtx *, FILE *);
inline void SCThresholdConfParseFile(DetectEngineCtx *, FILE *); void SCThresholdConfParseFile(DetectEngineCtx *, FILE *);
inline int SCThresholdConfInitContext(DetectEngineCtx *, FILE *); int SCThresholdConfInitContext(DetectEngineCtx *, FILE *);
void SCThresholdConfRegisterTests(); void SCThresholdConfRegisterTests();

Loading…
Cancel
Save