summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-04-26 21:29:20 +0000
committerRoger Dingledine <arma@torproject.org>2005-04-26 21:29:20 +0000
commit2a7aec0ffd48e7d626d262fa141e1654c6de742e (patch)
tree816d02e28208c53d4d6e1e8dd52c4e608d63eda8
parentecc76d824554e310d1f93a7d930dea552be3c5fc (diff)
downloadtor-2a7aec0ffd48e7d626d262fa141e1654c6de742e.tar.gz
tor-2a7aec0ffd48e7d626d262fa141e1654c6de742e.zip
fix function prototype, fix typo
svn:r4126
-rw-r--r--src/or/buffers.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c
index a3d2a0354a..c6bc89a3a0 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -12,11 +12,11 @@ const char buffers_c_id[] = "$Id$";
#include "or.h"
-#undef SENTINALS
+#undef SENTINELS
#undef CHECK_AFTER_RESIZE
-#ifdef SENTINALS
-/* If SENTINALS is defined, check for attempts to write beyond the
+#ifdef SENTINELS
+/* If SENTINELS is defined, check for attempts to write beyond the
* end/before the start of the buffer.
*/
#define START_MAGIC 0x70370370u
@@ -49,7 +49,7 @@ struct buf_t {
* than this size. */
#define MIN_BUF_SHRINK_SIZE (16*1024)
-static void peek_from_buf(char *string, size_t string_len, buf_t *buf);
+static INLINE void peek_from_buf(char *string, size_t string_len, buf_t *buf);
static void buf_normalize(buf_t *buf)
{
@@ -1039,7 +1039,7 @@ void assert_buf_ok(buf_t *buf)
tor_assert(buf->magic == BUFFER_MAGIC);
tor_assert(buf->mem);
tor_assert(buf->datalen <= buf->len);
-#ifdef SENTINALS
+#ifdef SENTINELS
tor_assert(get_uint32(buf->mem - 4) == START_MAGIC);
tor_assert(get_uint32(buf->mem + buf->len) == END_MAGIC);
#endif