diff options
| author | Martin Willi <martin@revosec.ch> | 2011-11-17 11:27:55 +0100 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-03-20 17:30:42 +0100 |
| commit | e9b55b832546d05f464bdddbe779ed21cd17b624 (patch) | |
| tree | 375064023de39c892823be79795c09aa8cd1e2d9 /src/libcharon/encoding/payloads/encryption_payload.c | |
| parent | 683d83ed3ef6c920a59f6d23d0f44c66fc6ded42 (diff) | |
| download | strongswan-e9b55b832546d05f464bdddbe779ed21cd17b624.tar.bz2 strongswan-e9b55b832546d05f464bdddbe779ed21cd17b624.tar.xz | |
Simplify signature of get_encoding_rules(), make all rules static
Diffstat (limited to 'src/libcharon/encoding/payloads/encryption_payload.c')
| -rw-r--r-- | src/libcharon/encoding/payloads/encryption_payload.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/libcharon/encoding/payloads/encryption_payload.c b/src/libcharon/encoding/payloads/encryption_payload.c index e7b8063b7..b0b863b36 100644 --- a/src/libcharon/encoding/payloads/encryption_payload.c +++ b/src/libcharon/encoding/payloads/encryption_payload.c @@ -79,7 +79,7 @@ struct private_encryption_payload_t { * The defined offsets are the positions in a object of type * private_encryption_payload_t. */ -encoding_rule_t encryption_payload_encodings[] = { +static encoding_rule_t encodings[] = { /* 1 Byte next payload type, stored in the field next_payload */ { U_INT_8, offsetof(private_encryption_payload_t, next_payload) }, /* Critical and 7 reserved bits, all stored for reconstruction */ @@ -115,12 +115,11 @@ METHOD(payload_t, verify, status_t, return SUCCESS; } -METHOD(payload_t, get_encoding_rules, void, - private_encryption_payload_t *this, encoding_rule_t **rules, - size_t *count) +METHOD(payload_t, get_encoding_rules, int, + private_encryption_payload_t *this, encoding_rule_t **rules) { - *rules = encryption_payload_encodings; - *count = countof(encryption_payload_encodings); + *rules = encodings; + return countof(encodings); } METHOD(payload_t, get_type, payload_type_t, |