github_mirrors/ModSecurity
3
0
Fork 1
mirror of https://github.com/owasp-modsecurity/ModSecurity.git synced 2025-09-30 03:34:29 +03:00
Code Issues Packages Projects Releases Wiki Activity

Cosmetics: assorted fixes on the coding style

Browse Source
This commit is contained in:
Felipe Zimmerle
2017-01-20 17:33:33 -03:00
committed by Felipe Zimmerle
parent a88dc8efa9
commit c1f11ab4e5
69 changed files with 76 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/variables/args_combined_size.h
View File

@@ -38,7 +38,6 @@ class ArgsCombinedSize : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableARGScombinedSize.evaluate(l);
}
};
} // namespace Variables

7
src/variables/args_get_names.h
View File

@@ -19,8 +19,8 @@
#include <list>
#include <utility>
#ifndef SRC_VARIABLES_ARGS_NAMES_GET_H_
#define SRC_VARIABLES_ARGS_NAMES_GET_H_
#ifndef SRC_VARIABLES_ARGS_GET_NAMES_H_
#define SRC_VARIABLES_ARGS_GET_NAMES_H_
#include "src/variables/variable.h"
@@ -38,10 +38,9 @@ class ArgsGetNames : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableArgGetNames.evaluate(l);
}
};
} // namespace Variables
} // namespace modsecurity
#endif // SRC_VARIABLES_ARGS_NAMES_GET_H_
#endif // SRC_VARIABLES_ARGS_GET_NAMES_H_

3
src/variables/args_names.h
View File

@@ -33,12 +33,11 @@ class ArgsNames : public Variable {
public:
ArgsNames()
: Variable("ARGS_NAMES") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableArgsNames.evaluate(l);
}
};
} // namespace Variables

7
src/variables/args_post_names.h
View File

@@ -19,8 +19,8 @@
#include <list>
#include <utility>
#ifndef SRC_VARIABLES_ARGS_NAMES_POST_H_
#define SRC_VARIABLES_ARGS_NAMES_POST_H_
#ifndef SRC_VARIABLES_ARGS_POST_NAMES_H_
#define SRC_VARIABLES_ARGS_POST_NAMES_H_
#include "src/variables/variable.h"
@@ -38,10 +38,9 @@ class ArgsPostNames : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableArgPostNames.evaluate(l);
}
};
} // namespace Variables
} // namespace modsecurity
#endif // SRC_VARIABLES_ARGS_NAMES_POST_H_
#endif // SRC_VARIABLES_ARGS_POST_NAMES_H_

1
src/variables/auth_type.h
View File

@@ -38,7 +38,6 @@ class AuthType : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableAuthType.evaluate(l);
}
};
} // namespace Variables

1
src/variables/files_combined_size.h
View File

@@ -38,7 +38,6 @@ class FilesCombinedSize : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableFilesCombinedSize.evaluate(l);
}
};
} // namespace Variables

1
src/variables/files_tmp_names.h
View File

@@ -38,7 +38,6 @@ class FilesTmpNames : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableFilesTmpNames.evaluate(l);
}
};
} // namespace Variables

1
src/variables/full_request.h
View File

@@ -38,7 +38,6 @@ class FullRequest : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableFullRequest.evaluate(l);
}
};
} // namespace Variables

1
src/variables/full_request_length.h
View File

@@ -38,7 +38,6 @@ class FullRequestLength : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableFullRequestLength.evaluate(l);
}
};
} // namespace Variables

1
src/variables/inbound_data_error.h
View File

@@ -38,7 +38,6 @@ class InboundDataError : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableInboundDataError.evaluate(l);
}
};
} // namespace Variables

1
src/variables/matched_var.h
View File

@@ -38,7 +38,6 @@ class MatchedVar : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableMatchedVar.evaluate(l);
}
};
} // namespace Variables

1
src/variables/matched_var_name.h
View File

@@ -38,7 +38,6 @@ class MatchedVarName : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableMatchedVarName.evaluate(l);
}
};
} // namespace Variables

1
src/variables/multipart_crlf_lf_line.h → src/variables/multipart_crlf_lf_lines.h
View File

@@ -38,7 +38,6 @@ class MultipartCrlfLFLines : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableMultipartCrlfLFLines.evaluate(l);
}
};
} // namespace Variables

1
src/variables/multipart_data_after.h
View File

@@ -38,7 +38,6 @@ class MultipartDateAfter : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableMultipartDataAfter.evaluate(l);
}
};
} // namespace Variables

1
src/variables/multipart_file_limit_exceeded.h
View File

@@ -38,7 +38,6 @@ class MultipartFileLimitExceeded : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableMultipartFileLimitExceeded.evaluate(l);
}
};
} // namespace Variables

1
src/variables/multipart_header_folding.h
View File

@@ -38,7 +38,6 @@ class MultipartHeaderFolding : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableMultipartHeaderFolding.evaluate(l);
}
};
} // namespace Variables

1
src/variables/multipart_invalid_header_folding.h
View File

@@ -38,7 +38,6 @@ class MultipartInvalidHeaderFolding : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableMultipartInvalidHeaderFolding.evaluate(l);
}
};
} // namespace Variables

2
src/variables/multipart_invalid_quoting.h
View File

@@ -33,12 +33,10 @@ class MultipartInvalidQuoting : public Variable {
public:
MultipartInvalidQuoting()
: Variable("MULTIPART_INVALID_QUOTING") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableMultipartInvalidQuoting.evaluate(l);
}
};
} // namespace Variables

1
src/variables/multipart_strict_error.h
View File

@@ -38,7 +38,6 @@ class MultipartStrictError : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableMultipartStrictError.evaluate(l);
}
};
} // namespace Variables

3
src/variables/multipart_unmatched_boundary.h
View File

@@ -38,10 +38,9 @@ class MultipartUnmatchedBoundary : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableMultipartUnmatchedBoundary.evaluate(l);
}
};
} // namespace Variables
} // namespace modsecurity
#endif // SRC_VARIABLES_ARGS_NAMES_H_
#endif // SRC_VARIABLES_MULTIPART_UNMATCHED_BOUNDARY_H_

1
src/variables/outbound_data_error.h
View File

@@ -38,7 +38,6 @@ class OutboundDataError : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableOutboundDataError.evaluate(l);
}
};
} // namespace Variables

1
src/variables/path_info.h
View File

@@ -38,7 +38,6 @@ class PathInfo : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variablePathInfo.evaluate(l);
}
};
} // namespace Variables

1
src/variables/query_string.h
View File

@@ -38,7 +38,6 @@ class QueryString : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableQueryString.evaluate(l);
}
};
} // namespace Variables

1
src/variables/remote_addr.h
View File

@@ -38,7 +38,6 @@ class RemoteAddr : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableRemoteAddr.evaluate(l);
}
};
} // namespace Variables

1
src/variables/remote_host.h
View File

@@ -38,7 +38,6 @@ class RemoteHost : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableRemoteHost.evaluate(l);
}
};
} // namespace Variables

1
src/variables/remote_port.h
View File

@@ -38,7 +38,6 @@ class RemotePort : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableRemotePort.evaluate(l);
}
};
} // namespace Variables

1
src/variables/reqbody_error.h
View File

@@ -38,7 +38,6 @@ class ReqbodyError : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableReqbodyError.evaluate(l);
}
};
} // namespace Variables

2
src/variables/reqbody_error_msg.h
View File

@@ -33,12 +33,10 @@ class ReqbodyErrorMsg : public Variable {
public:
ReqbodyErrorMsg()
: Variable("REQBODY_ERROR_MSG") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableReqbodyErrorMsg.evaluate(l);
}
};
} // namespace Variables

2
src/variables/reqbody_processor.h
View File

@@ -33,12 +33,10 @@ class ReqbodyProcessor : public Variable {
public:
ReqbodyProcessor()
: Variable("REQBODY_PROCESSOR") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableReqbodyProcessor.evaluate(l);
}
};
} // namespace Variables

1
src/variables/reqbody_processor_error.h
View File

@@ -38,7 +38,6 @@ class ReqbodyProcessorError : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableReqbodyProcessorError.evaluate(l);
}
};
} // namespace Variables

7
src/variables/reqbody_processor_error_msg.h
View File

@@ -19,8 +19,8 @@
#include <list>
#include <utility>
#ifndef SRC_VARIABLES_PROCESSOR_ERROR_MSG_H_
#define SRC_VARIABLES_PROCESSOR_ERROR_MSG_H_
#ifndef SRC_VARIABLES_REQBODY_PROCESSOR_ERROR_MSG_H_
#define SRC_VARIABLES_REQBODY_PROCESSOR_ERROR_MSG_H_
#include "src/variables/variable.h"
@@ -38,10 +38,9 @@ class ReqbodyProcessorErrorMsg : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableReqbodyProcessorErrorMsg.evaluate(l);
}
};
} // namespace Variables
} // namespace modsecurity
#endif // SRC_VARIABLES_PROCESSOR_ERROR_MSG_H_
#endif // SRC_VARIABLES_REQBODY_PROCESSOR_ERROR_MSG_H_

7
src/variables/request_base_name.h
View File

@@ -19,8 +19,8 @@
#include <list>
#include <utility>
#ifndef SRC_VARIABLES_REQUEST_BASENAME_H_
#define SRC_VARIABLES_REQUEST_BASENAME_H_
#ifndef SRC_VARIABLES_REQUEST_BASE_NAME_H_
#define SRC_VARIABLES_REQUEST_BASE_NAME_H_
#include "src/variables/variable.h"
@@ -38,10 +38,9 @@ class RequestBasename : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestBasename.evaluate(l);
}
};
} // namespace Variables
} // namespace modsecurity
#endif // SRC_VARIABLES_REQUEST_BASENAME_H_
#endif // SRC_VARIABLES_REQUEST_BASE_NAME_H_

2
src/variables/request_body.h
View File

@@ -33,12 +33,10 @@ class RequestBody : public Variable {
public:
RequestBody()
: Variable("REQUEST_BODY") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestBody.evaluate(l);
}
};
} // namespace Variables

2
src/variables/request_body_length.h
View File

@@ -33,12 +33,10 @@ class RequestBodyLength : public Variable {
public:
RequestBodyLength()
: Variable("REQUEST_BODY_LENGTH") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestBodyLength.evaluate(l);
}
};
} // namespace Variables

8
src/variables/request_file_name.h
View File

@@ -19,8 +19,8 @@
#include <list>
#include <utility>
#ifndef SRC_VARIABLES_REQUEST_FILENAME_H_
#define SRC_VARIABLES_REQUEST_FILENAME_H_
#ifndef SRC_VARIABLES_REQUEST_FILE_NAME_H_
#define SRC_VARIABLES_REQUEST_FILE_NAME_H_
#include "src/variables/variable.h"
@@ -33,15 +33,13 @@ class RequestFilename : public Variable {
public:
RequestFilename()
: Variable("REQUEST_FILENAME") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestFilename.evaluate(l);
}
};
} // namespace Variables
} // namespace modsecurity
#endif // SRC_VARIABLES_REQUEST_FILENAME_H_
#endif // SRC_VARIABLES_REQUEST_FILE_NAME_H_

4
src/variables/request_headers_names.h
View File

@@ -33,15 +33,13 @@ class RequestHeadersNames : public Variable {
public:
RequestHeadersNames()
: Variable("REQUEST_HEADERS_NAMES") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestHeadersNames.evaluate(l);
}
};
} // namespace Variables
} // namespace modsecurity
#endif // SRC_VARIABLES_TIMEARG_NAMES_H_
#endif // SRC_VARIABLES_REQUEST_HEADERS_NAMES_H_

2
src/variables/request_line.h
View File

@@ -33,12 +33,10 @@ class RequestLine : public Variable {
public:
RequestLine()
: Variable("REQUEST_LINE") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestLine.evaluate(l);
}
};
} // namespace Variables

2
src/variables/request_method.h
View File

@@ -33,12 +33,10 @@ class RequestMethod : public Variable {
public:
RequestMethod()
: Variable("REQUEST_METHOD") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestMethod.evaluate(l);
}
};
} // namespace Variables

2
src/variables/request_protocol.h
View File

@@ -33,12 +33,10 @@ class RequestProtocol : public Variable {
public:
RequestProtocol()
: Variable("REQUEST_PROTOCOL") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestProtocol.evaluate(l);
}
};
} // namespace Variables

2
src/variables/request_uri.h
View File

@@ -33,12 +33,10 @@ class RequestURI : public Variable {
public:
RequestURI()
: Variable("REQUEST_URI") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestURI.evaluate(l);
}
};
} // namespace Variables

2
src/variables/request_uri_raw.h
View File

@@ -33,12 +33,10 @@ class RequestURIRaw : public Variable {
public:
RequestURIRaw()
: Variable("REQUEST_URI_RAW") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableRequestURIRaw.evaluate(l);
}
};
} // namespace Variables

1
src/variables/resources.h → src/variables/resource.h
View File

@@ -38,7 +38,6 @@ class Resource : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableResource.evaluate(l);
}
};
} // namespace Variables

2
src/variables/response_body.h
View File

@@ -33,12 +33,10 @@ class ResponseBody : public Variable {
public:
ResponseBody()
: Variable("RESPONSE_BODY") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableResponseBody.evaluate(l);
}
};
} // namespace Variables

2
src/variables/response_content_length.h
View File

@@ -33,12 +33,10 @@ class ResponseContentLength : public Variable {
public:
ResponseContentLength()
: Variable("RESPONSE_CONTENT_LENGTH") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableResponseContentLength.evaluate(l);
}
};
} // namespace Variables

1
src/variables/response_content_type.h
View File

@@ -33,7 +33,6 @@ class ResponseContentType : public Variable {
public:
ResponseContentType()
: Variable("RESPONSE_CONTENT_TYPE") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableResponseContentType.evaluate(l);

6
src/variables/response_headers_names.h
View File

@@ -19,8 +19,8 @@
#include <list>
#include <utility>
#ifndef SRC_VARIABLES_ARG_NAMES_H_
#define SRC_VARIABLES_ARG_NAMES_H_
#ifndef SRC_VARIABLES_RESPONSE_HEADERS_NAMES_H_
#define SRC_VARIABLES_RESPONSE_HEADERS_NAMES_H_
#include "src/variables/variable.h"
@@ -43,4 +43,4 @@ class ResponseHeadersNames : public Variable {
} // namespace Variables
} // namespace modsecurity
#endif // SRC_VARIABLES_TIMEARG_NAMES_H_
#endif // SRC_VARIABLES_RESPONSE_HEADERS_NAMES_H_

2
src/variables/response_protocol.h
View File

@@ -33,12 +33,10 @@ class ResponseProtocol : public Variable {
public:
ResponseProtocol()
: Variable("RESPONSE_PROTOCOL") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableResponseProtocol.evaluate(l);
}
};
} // namespace Variables

2
src/variables/response_status.h
View File

@@ -33,12 +33,10 @@ class ResponseStatus : public Variable {
public:
ResponseStatus()
: Variable("RESPONSE_STATUS") { }
void evaluateInternal(Transaction *transaction,
std::vector<const collection::Variable *> *l) {
transaction->m_variableResponseStatus.evaluate(l);
}
};
} // namespace Variables

1
src/variables/server_addr.h
View File

@@ -38,7 +38,6 @@ class ServerAddr : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableServerAddr.evaluate(l);
}
};
} // namespace Variables

1
src/variables/server_name.h
View File

@@ -38,7 +38,6 @@ class ServerName : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableServerName.evaluate(l);
}
};
} // namespace Variables

1
src/variables/server_port.h
View File

@@ -38,7 +38,6 @@ class ServerPort : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableServerPort.evaluate(l);
}
};
} // namespace Variables

1
src/variables/session_id.h
View File

@@ -38,7 +38,6 @@ class SessionID : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableSessionID.evaluate(l);
}
};
} // namespace Variables

1
src/variables/unique_id.h
View File

@@ -38,7 +38,6 @@ class UniqueID : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableUniqueID.evaluate(l);
}
};
} // namespace Variables

1
src/variables/url_encoded_error.h
View File

@@ -38,7 +38,6 @@ class UrlEncodedError : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableUrlEncodedError.evaluate(l);
}
};
} // namespace Variables

1
src/variables/user_id.h
View File

@@ -38,7 +38,6 @@ class UserID : public Variable {
std::vector<const collection::Variable *> *l) {
transaction->m_variableUserID.evaluate(l);
}
};
} // namespace Variables