aboutsummaryrefslogtreecommitdiff
path: root/sys/sys/sbuf.h
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2014-07-28 07:20:22 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2014-07-28 07:20:22 +0000
commitadecd05bf0293be427de08c863bf62887c075ef0 (patch)
treee4ce4827778d787b90ddbc1e70d65711e4176c04 /sys/sys/sbuf.h
parent4d3ff0c3e6ee6d5f059208fe0c86ba4d4ae43510 (diff)
downloadsrc-adecd05bf0293be427de08c863bf62887c075ef0.tar.gz
src-adecd05bf0293be427de08c863bf62887c075ef0.zip
Unbreak the ABI by reverting r268494 until the compat shims are provided
Notes
Notes: svn path=/head/; revision=269179
Diffstat (limited to 'sys/sys/sbuf.h')
-rw-r--r--sys/sys/sbuf.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/sys/sbuf.h b/sys/sys/sbuf.h
index 9c794c830543..9816a4cd6c54 100644
--- a/sys/sys/sbuf.h
+++ b/sys/sys/sbuf.h
@@ -44,8 +44,8 @@ struct sbuf {
sbuf_drain_func *s_drain_func; /* drain function */
void *s_drain_arg; /* user-supplied drain argument */
int s_error; /* current error code */
- size_t s_size; /* size of storage buffer */
- size_t s_len; /* current length of string */
+ ssize_t s_size; /* size of storage buffer */
+ ssize_t s_len; /* current length of string */
#define SBUF_FIXEDLEN 0x00000000 /* fixed length buffer (default) */
#define SBUF_AUTOEXTEND 0x00000001 /* automatically extend buffer */
#define SBUF_USRFLAGMSK 0x0000ffff /* mask of flags the user may specify */
@@ -55,9 +55,6 @@ struct sbuf {
#define SBUF_INSECTION 0x00100000 /* set by sbuf_start_section() */
int s_flags; /* flags */
ssize_t s_sect_len; /* current length of section */
-#define SBUF_STATIC_LEN 64 /* static storage buffer length */
- char s_static_buf[SBUF_STATIC_LEN];
- /* static storage buffer */
};
__BEGIN_DECLS
@@ -68,7 +65,7 @@ struct sbuf *sbuf_new(struct sbuf *, char *, int, int);
#define sbuf_new_auto() \
sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND)
void sbuf_clear(struct sbuf *);
-int sbuf_setpos(struct sbuf *, size_t);
+int sbuf_setpos(struct sbuf *, ssize_t);
int sbuf_bcat(struct sbuf *, const void *, size_t);
int sbuf_bcpy(struct sbuf *, const void *, size_t);
int sbuf_cat(struct sbuf *, const char *);