[or-cvs] fix function prototype, fix typo

[arma@xxxxxxxx (Roger Dingledine)]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	buffers.c 
Log Message:
fix function prototype, fix typo


Index: buffers.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/buffers.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- buffers.c	26 Apr 2005 21:20:22 -0000	1.137
+++ buffers.c	26 Apr 2005 21:29:20 -0000	1.138
@@ -12,11 +12,11 @@
 
 #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 @@
  * 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 @@
   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