summaryrefslogtreecommitdiff
path: root/src/or/buffers.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-08-02 13:40:19 -0400
committerNick Mathewson <nickm@torproject.org>2016-08-02 13:50:00 -0400
commit46ef4487d3914cac1aba148ec58ff271bda3c636 (patch)
tree300a4fdfb5f8714ae970fe78c9bd9beeda6c378b /src/or/buffers.h
parentcd9d39d54bbc9998938e9acddb1ec34507fc9108 (diff)
downloadtor-46ef4487d3914cac1aba148ec58ff271bda3c636.tar.gz
tor-46ef4487d3914cac1aba148ec58ff271bda3c636.zip
Remove generic_buffer_*() functions as needless.
These functions were there so that we could abstract the differences between evbuffer and buf_t. But with the bufferevent removal, this no longer serves a purpose.
Diffstat (limited to 'src/or/buffers.h')
-rw-r--r--src/or/buffers.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/or/buffers.h b/src/or/buffers.h
index 3629fc32c5..275867c70a 100644
--- a/src/or/buffers.h
+++ b/src/or/buffers.h
@@ -56,17 +56,8 @@ int peek_buf_has_control0_command(buf_t *buf);
int fetch_ext_or_command_from_buf(buf_t *buf, ext_or_cmd_t **out);
-#define generic_buffer_new() buf_new()
-#define generic_buffer_len(b) buf_datalen((b))
-#define generic_buffer_add(b,dat,len) write_to_buf((dat),(len),(b))
-#define generic_buffer_get(b,buf,buflen) fetch_from_buf((buf),(buflen),(b))
-#define generic_buffer_clear(b) buf_clear((b))
-#define generic_buffer_free(b) buf_free((b))
-#define generic_buffer_fetch_ext_or_cmd(b, out) \
- fetch_ext_or_command_from_buf((b), (out))
-
-int buf_set_to_copy(generic_buffer_t **output,
- const generic_buffer_t *input);
+int buf_set_to_copy(buf_t **output,
+ const buf_t *input);
void assert_buf_ok(buf_t *buf);