=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v retrieving revision 1.163 retrieving revision 1.164 diff -c -r1.163 -r1.164 *** src/usr.bin/tmux/tmux.h 2009/11/04 22:43:11 1.163 --- src/usr.bin/tmux/tmux.h 2009/11/04 22:44:53 1.164 *************** *** 1,4 **** ! /* $OpenBSD: tmux.h,v 1.163 2009/11/04 22:43:11 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott --- 1,4 ---- ! /* $OpenBSD: tmux.h,v 1.164 2009/11/04 22:44:53 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott *************** *** 96,116 **** #define nitems(_a) (sizeof((_a)) / sizeof((_a)[0])) #endif - /* Buffer macros. */ - #define BUFFER_USED(b) ((b)->size) - #define BUFFER_FREE(b) ((b)->space - (b)->off - (b)->size) - #define BUFFER_IN(b) ((b)->base + (b)->off + (b)->size) - #define BUFFER_OUT(b) ((b)->base + (b)->off) - - /* Buffer structure. */ - struct buffer { - u_char *base; /* buffer start */ - size_t space; /* total size of buffer */ - - size_t size; /* size of data in buffer */ - size_t off; /* offset of data in buffer */ - }; - /* Bell option values. */ #define BELL_NONE 0 #define BELL_ANY 1 --- 96,101 ---- *************** *** 1907,1926 **** /* procname.c */ char *get_proc_name(int, char *); - - /* buffer.c */ - struct buffer *buffer_create(size_t); - void buffer_destroy(struct buffer *); - void buffer_ensure(struct buffer *, size_t); - void buffer_add(struct buffer *, size_t); - void buffer_remove(struct buffer *, size_t); - void buffer_write(struct buffer *, const void *, size_t); - void buffer_read(struct buffer *, void *, size_t); - void buffer_write8(struct buffer *, uint8_t); - uint8_t buffer_read8(struct buffer *); - - /* buffer-poll.c */ - int buffer_poll(int, int, struct buffer *, struct buffer *); /* log.c */ void log_open_tty(int); --- 1892,1897 ----