diff options
author | Damien Miller <djm@mindrot.org> | 2010-02-12 09:23:40 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-02-12 09:23:40 +1100 |
commit | 8922106fe9df50810e4149a05f7e3f9585ec08cc (patch) | |
tree | 66413982ac665d82de2969628c2baacb200e246f | |
parent | 86cbb44d47c49b108b94854b02dd5c3eae19123d (diff) |
- djm@cvs.openbsd.org 2010/02/09 03:56:28
[buffer.c buffer.h]
constify the arguments to buffer_len, buffer_ptr and buffer_dump
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | buffer.c | 8 | ||||
-rw-r--r-- | buffer.h | 8 |
3 files changed, 11 insertions, 8 deletions
@@ -24,6 +24,9 @@ | |||
24 | - djm@cvs.openbsd.org 2010/02/09 00:50:59 | 24 | - djm@cvs.openbsd.org 2010/02/09 00:50:59 |
25 | [ssh-keygen.c] | 25 | [ssh-keygen.c] |
26 | fix -Wall | 26 | fix -Wall |
27 | - djm@cvs.openbsd.org 2010/02/09 03:56:28 | ||
28 | [buffer.c buffer.h] | ||
29 | constify the arguments to buffer_len, buffer_ptr and buffer_dump | ||
27 | 30 | ||
28 | 20100210 | 31 | 20100210 |
29 | - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for | 32 | - (djm) add -lselinux to LIBS before calling AC_CHECK_FUNCS for |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: buffer.c,v 1.31 2006/08/03 03:34:41 deraadt Exp $ */ | 1 | /* $OpenBSD: buffer.c,v 1.32 2010/02/09 03:56:28 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -160,7 +160,7 @@ buffer_check_alloc(Buffer *buffer, u_int len) | |||
160 | /* Returns the number of bytes of data in the buffer. */ | 160 | /* Returns the number of bytes of data in the buffer. */ |
161 | 161 | ||
162 | u_int | 162 | u_int |
163 | buffer_len(Buffer *buffer) | 163 | buffer_len(const Buffer *buffer) |
164 | { | 164 | { |
165 | return buffer->end - buffer->offset; | 165 | return buffer->end - buffer->offset; |
166 | } | 166 | } |
@@ -228,7 +228,7 @@ buffer_consume_end(Buffer *buffer, u_int bytes) | |||
228 | /* Returns a pointer to the first used byte in the buffer. */ | 228 | /* Returns a pointer to the first used byte in the buffer. */ |
229 | 229 | ||
230 | void * | 230 | void * |
231 | buffer_ptr(Buffer *buffer) | 231 | buffer_ptr(const Buffer *buffer) |
232 | { | 232 | { |
233 | return buffer->buf + buffer->offset; | 233 | return buffer->buf + buffer->offset; |
234 | } | 234 | } |
@@ -236,7 +236,7 @@ buffer_ptr(Buffer *buffer) | |||
236 | /* Dumps the contents of the buffer to stderr. */ | 236 | /* Dumps the contents of the buffer to stderr. */ |
237 | 237 | ||
238 | void | 238 | void |
239 | buffer_dump(Buffer *buffer) | 239 | buffer_dump(const Buffer *buffer) |
240 | { | 240 | { |
241 | u_int i; | 241 | u_int i; |
242 | u_char *ucp = buffer->buf; | 242 | u_char *ucp = buffer->buf; |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: buffer.h,v 1.18 2010/01/12 01:36:08 djm Exp $ */ | 1 | /* $OpenBSD: buffer.h,v 1.19 2010/02/09 03:56:28 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -27,8 +27,8 @@ void buffer_init(Buffer *); | |||
27 | void buffer_clear(Buffer *); | 27 | void buffer_clear(Buffer *); |
28 | void buffer_free(Buffer *); | 28 | void buffer_free(Buffer *); |
29 | 29 | ||
30 | u_int buffer_len(Buffer *); | 30 | u_int buffer_len(const Buffer *); |
31 | void *buffer_ptr(Buffer *); | 31 | void *buffer_ptr(const Buffer *); |
32 | 32 | ||
33 | void buffer_append(Buffer *, const void *, u_int); | 33 | void buffer_append(Buffer *, const void *, u_int); |
34 | void *buffer_append_space(Buffer *, u_int); | 34 | void *buffer_append_space(Buffer *, u_int); |
@@ -40,7 +40,7 @@ void buffer_get(Buffer *, void *, u_int); | |||
40 | void buffer_consume(Buffer *, u_int); | 40 | void buffer_consume(Buffer *, u_int); |
41 | void buffer_consume_end(Buffer *, u_int); | 41 | void buffer_consume_end(Buffer *, u_int); |
42 | 42 | ||
43 | void buffer_dump(Buffer *); | 43 | void buffer_dump(const Buffer *); |
44 | 44 | ||
45 | int buffer_get_ret(Buffer *, void *, u_int); | 45 | int buffer_get_ret(Buffer *, void *, u_int); |
46 | int buffer_consume_ret(Buffer *, u_int); | 46 | int buffer_consume_ret(Buffer *, u_int); |