diff options
author | Damien Miller <djm@mindrot.org> | 2014-05-15 13:48:26 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-05-15 13:48:26 +1000 |
commit | 633de33b192d808d87537834c316dc8b75fe1880 (patch) | |
tree | 54d456735ab7e2848dc8df5eba9c3dbb314b29e1 /mux.c | |
parent | 15271907843e4ae50dcfc83b3594014cf5e9607b (diff) |
- djm@cvs.openbsd.org 2014/04/28 03:09:18
[authfile.c bufaux.c buffer.h channels.c krl.c mux.c packet.c packet.h]
[ssh-keygen.c]
buffer_get_string_ptr's return should be const to remind
callers that futzing with it will futz with the actual buffer
contents
Diffstat (limited to 'mux.c')
-rw-r--r-- | mux.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: mux.c,v 1.44 2013/07/12 00:19:58 djm Exp $ */ | 1 | /* $OpenBSD: mux.c,v 1.45 2014/04/28 03:09:18 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -1010,7 +1010,7 @@ mux_master_read_cb(Channel *c) | |||
1010 | { | 1010 | { |
1011 | struct mux_master_state *state = (struct mux_master_state *)c->mux_ctx; | 1011 | struct mux_master_state *state = (struct mux_master_state *)c->mux_ctx; |
1012 | Buffer in, out; | 1012 | Buffer in, out; |
1013 | void *ptr; | 1013 | const u_char *ptr; |
1014 | u_int type, rid, have, i; | 1014 | u_int type, rid, have, i; |
1015 | int ret = -1; | 1015 | int ret = -1; |
1016 | 1016 | ||
@@ -1429,7 +1429,7 @@ mux_client_read_packet(int fd, Buffer *m) | |||
1429 | { | 1429 | { |
1430 | Buffer queue; | 1430 | Buffer queue; |
1431 | u_int need, have; | 1431 | u_int need, have; |
1432 | void *ptr; | 1432 | const u_char *ptr; |
1433 | int oerrno; | 1433 | int oerrno; |
1434 | 1434 | ||
1435 | buffer_init(&queue); | 1435 | buffer_init(&queue); |