1 files changed, 26 insertions, 33 deletions

diff --git a/include/buffer.h b/include/buffer.h
index 57cd960..4f513e7 100644
--- a/include/buffer.h
+++ b/include/buffer.h
@@ -1,6 +1,6 @@
 #ifndef BUFFER_H
 #define BUFFER_H
-#include <sys/types.h>   /* need type: ssize_t */
+#include <sys/types.h> /* need type: ssize_t */
 
 typedef struct buffer {
   char *x;
@@ -10,48 +10,41 @@ typedef struct buffer {
   ssize_t (*op)();
 } buffer;
 
-#define BUFFER_INIT(op,fd,buf,len) { (buf), 0, (len), (fd), (op) }
-#define BUFFER_SMALL 256
-#define BUFFER_INSIZE 8192
-#define BUFFER_OUTSIZE 8192
-#define BUFFER_MTUSIZE 1450
+#define BUFFER_INIT(op, fd, buf, len) {(buf), 0, (len), (fd), (op)}
+#define BUFFER_SMALL                  256
+#define BUFFER_INSIZE                 8192
+#define BUFFER_OUTSIZE                8192
+#define BUFFER_MTUSIZE                1450
 
-extern void buffer_init(buffer *,ssize_t (*op)(),int,char *,size_t);
+extern void buffer_init(buffer *, ssize_t (*op)(), int, char *, size_t);
 
 extern int buffer_flush(buffer *);
-extern int buffer_put(buffer *,const char *,size_t);
-extern int buffer_putalign(buffer *,const char *,size_t);
-extern int buffer_putflush(buffer *,const char *,size_t);
-extern int buffer_puts(buffer *,const char *);
-extern int buffer_putsalign(buffer *,const char *);
-extern int buffer_putsflush(buffer *,const char *);
-
-#define buffer_PUTC(s,c) \
-  ( ((s)->n != (s)->p) \
-    ? ( (s)->x[(s)->p++] = (c), 0 ) \
-    : buffer_put((s),&(c),1) \
-  )
-
-extern int buffer_get(buffer *,char *,size_t);
-extern int buffer_bget(buffer *,char *,size_t);
+extern int buffer_put(buffer *, const char *, size_t);
+extern int buffer_putalign(buffer *, const char *, size_t);
+extern int buffer_putflush(buffer *, const char *, size_t);
+extern int buffer_puts(buffer *, const char *);
+extern int buffer_putsalign(buffer *, const char *);
+extern int buffer_putsflush(buffer *, const char *);
+
+#define buffer_PUTC(s, c) (((s)->n != (s)->p) ? ((s)->x[(s)->p++] = (c), 0) : buffer_put((s), &(c), 1))
+
+extern int buffer_get(buffer *, char *, size_t);
+extern int buffer_bget(buffer *, char *, size_t);
 extern int buffer_feed(buffer *);
 
 extern char *buffer_peek(buffer *);
-extern void buffer_seek(buffer *,size_t);
+extern void buffer_seek(buffer *, size_t);
 
-#define buffer_PEEK(s) ( (s)->x + (s)->n )
-#define buffer_SEEK(s,len) ( ( (s)->p -= (len) ) , ( (s)->n += (len) ) )
+#define buffer_PEEK(s)      ((s)->x + (s)->n)
+#define buffer_SEEK(s, len) (((s)->p -= (len)), ((s)->n += (len)))
 
-#define buffer_GETC(s,c) \
-  ( ((s)->p > 0) \
-    ? ( *(c) = (s)->x[(s)->n], buffer_SEEK((s),1), 1 ) \
-    : buffer_get((s),(c),1) \
-  )
+#define buffer_GETC(s, c) \
+  (((s)->p > 0) ? (*(c) = (s)->x[(s)->n], buffer_SEEK((s), 1), 1) : buffer_get((s), (c), 1))
 
-extern int buffer_copy(buffer *,buffer *);
+extern int buffer_copy(buffer *, buffer *);
 
-extern ssize_t buffer_unixread(int,char *,size_t);
-extern ssize_t buffer_unixwrite(int,char *,size_t);
+extern ssize_t buffer_unixread(int, char *, size_t);
+extern ssize_t buffer_unixwrite(int, char *, size_t);
 
 extern buffer *buffer_0;
 extern buffer *buffer_1;