summaryrefslogtreecommitdiff
path: root/buffer.c
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2015-06-04 23:08:50 +0800
committerMatt Johnston <matt@ucc.asn.au>2015-06-04 23:08:50 +0800
commit6e3355f4c3a5b5e9a4ef33b02478fa6811870730 (patch)
tree4671c7337586ae813f7e5e9a5d67ae95ab747f61 /buffer.c
parentc0e5fca0bd82e13dce2eb4c64eaf85d427e33608 (diff)
downloaddropbear-6e3355f4c3a5b5e9a4ef33b02478fa6811870730.tar.gz
buf_getstring and buf_putstring now use non-unsigned char*
Diffstat (limited to 'buffer.c')
-rw-r--r--buffer.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/buffer.c b/buffer.c
index d043bdb..1e5a864 100644
--- a/buffer.c
+++ b/buffer.c
@@ -203,10 +203,10 @@ unsigned char* buf_getwriteptr(buffer* buf, unsigned int len) {
/* Return a null-terminated string, it is malloced, so must be free()ed
* Note that the string isn't checked for null bytes, hence the retlen
* may be longer than what is returned by strlen */
-unsigned char* buf_getstring(buffer* buf, unsigned int *retlen) {
+char* buf_getstring(buffer* buf, unsigned int *retlen) {
unsigned int len;
- unsigned char* ret;
+ char* ret;
len = buf_getint(buf);
if (len > MAX_STRING_LEN) {
dropbear_exit("String too long");
@@ -262,16 +262,16 @@ void buf_putint(buffer* buf, int unsigned val) {
}
/* put a SSH style string into the buffer, increasing buffer len if required */
-void buf_putstring(buffer* buf, const unsigned char* str, unsigned int len) {
+void buf_putstring(buffer* buf, const char* str, unsigned int len) {
buf_putint(buf, len);
- buf_putbytes(buf, str, len);
+ buf_putbytes(buf, (const unsigned char*)str, len);
}
/* puts an entire buffer as a SSH string. ignore pos of buf_str. */
void buf_putbufstring(buffer *buf, const buffer* buf_str) {
- buf_putstring(buf, buf_str->data, buf_str->len);
+ buf_putstring(buf, (const char*)buf_str->data, buf_str->len);
}
/* put the set of len bytes into the buffer, incrementing the pos, increasing