diff options
| author | guenther <> | 2014-06-02 05:17:45 +0000 |
|---|---|---|
| committer | guenther <> | 2014-06-02 05:17:45 +0000 |
| commit | 95c0ce676f45c601e820a171f77a88e23dc3eacd (patch) | |
| tree | bbbf32cb222e96dbfcab425620d15e8d0899e9a0 /src/lib | |
| parent | 9c68e5e249ef03e199add135515dbefcd5c0f9aa (diff) | |
| download | openbsd-95c0ce676f45c601e820a171f77a88e23dc3eacd.tar.gz openbsd-95c0ce676f45c601e820a171f77a88e23dc3eacd.tar.bz2 openbsd-95c0ce676f45c601e820a171f77a88e23dc3eacd.zip | |
Since pqueue is a private interface and the header defining the struct
isn't even exported, there's no (sane) way for someone else to use the
typedef. Eliminate the typedef and just use "struct _pqueue *".
duplicate typedef pointed out by Brent Cook (busterb (at) gmail.com)
ok miod@
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/libssl/dtls1.h | 7 | ||||
| -rw-r--r-- | src/lib/libssl/src/ssl/dtls1.h | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/libssl/dtls1.h b/src/lib/libssl/dtls1.h index b0cf839b78..5a14ee427b 100644 --- a/src/lib/libssl/dtls1.h +++ b/src/lib/libssl/dtls1.h | |||
| @@ -144,11 +144,10 @@ struct dtls1_timeout_st { | |||
| 144 | }; | 144 | }; |
| 145 | 145 | ||
| 146 | struct _pqueue; | 146 | struct _pqueue; |
| 147 | typedef struct _pqueue *pqueue; | ||
| 148 | 147 | ||
| 149 | typedef struct record_pqueue_st { | 148 | typedef struct record_pqueue_st { |
| 150 | unsigned short epoch; | 149 | unsigned short epoch; |
| 151 | pqueue q; | 150 | struct _pqueue *q; |
| 152 | } record_pqueue; | 151 | } record_pqueue; |
| 153 | 152 | ||
| 154 | typedef struct hm_fragment_st { | 153 | typedef struct hm_fragment_st { |
| @@ -191,10 +190,10 @@ typedef struct dtls1_state_st { | |||
| 191 | record_pqueue processed_rcds; | 190 | record_pqueue processed_rcds; |
| 192 | 191 | ||
| 193 | /* Buffered handshake messages */ | 192 | /* Buffered handshake messages */ |
| 194 | pqueue buffered_messages; | 193 | struct _pqueue *buffered_messages; |
| 195 | 194 | ||
| 196 | /* Buffered (sent) handshake records */ | 195 | /* Buffered (sent) handshake records */ |
| 197 | pqueue sent_messages; | 196 | struct _pqueue *sent_messages; |
| 198 | 197 | ||
| 199 | /* Buffered application records. | 198 | /* Buffered application records. |
| 200 | * Only for records between CCS and Finished | 199 | * Only for records between CCS and Finished |
diff --git a/src/lib/libssl/src/ssl/dtls1.h b/src/lib/libssl/src/ssl/dtls1.h index b0cf839b78..5a14ee427b 100644 --- a/src/lib/libssl/src/ssl/dtls1.h +++ b/src/lib/libssl/src/ssl/dtls1.h | |||
| @@ -144,11 +144,10 @@ struct dtls1_timeout_st { | |||
| 144 | }; | 144 | }; |
| 145 | 145 | ||
| 146 | struct _pqueue; | 146 | struct _pqueue; |
| 147 | typedef struct _pqueue *pqueue; | ||
| 148 | 147 | ||
| 149 | typedef struct record_pqueue_st { | 148 | typedef struct record_pqueue_st { |
| 150 | unsigned short epoch; | 149 | unsigned short epoch; |
| 151 | pqueue q; | 150 | struct _pqueue *q; |
| 152 | } record_pqueue; | 151 | } record_pqueue; |
| 153 | 152 | ||
| 154 | typedef struct hm_fragment_st { | 153 | typedef struct hm_fragment_st { |
| @@ -191,10 +190,10 @@ typedef struct dtls1_state_st { | |||
| 191 | record_pqueue processed_rcds; | 190 | record_pqueue processed_rcds; |
| 192 | 191 | ||
| 193 | /* Buffered handshake messages */ | 192 | /* Buffered handshake messages */ |
| 194 | pqueue buffered_messages; | 193 | struct _pqueue *buffered_messages; |
| 195 | 194 | ||
| 196 | /* Buffered (sent) handshake records */ | 195 | /* Buffered (sent) handshake records */ |
| 197 | pqueue sent_messages; | 196 | struct _pqueue *sent_messages; |
| 198 | 197 | ||
| 199 | /* Buffered application records. | 198 | /* Buffered application records. |
| 200 | * Only for records between CCS and Finished | 199 | * Only for records between CCS and Finished |