Skip to content

U
unique-xids
Commit 7e684a36 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

Mechanical name changes of internal functions, to catch up with 

changes to sbuf in FreeBSD.
parent 9cfe535f
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 29 deletions
lib/libvarnish/vsb.c
View file @ 7e684a36
...@@ -73,7 +73,7 @@ SVNID("$Id$") ...@@ -73,7 +73,7 @@ SVNID("$Id$")
*/ */
#if !defined(NDEBUG) #if !defined(NDEBUG)
static void static void
_vsb_assert_integrity(const char *fun, struct vsb *s) _assert_vsb_integrity(const char *fun, struct vsb *s)
{ {
(void)fun; (void)fun;
...@@ -89,7 +89,7 @@ _vsb_assert_integrity(const char *fun, struct vsb *s) ...@@ -89,7 +89,7 @@ _vsb_assert_integrity(const char *fun, struct vsb *s)
} }
static void static void
_vsb_assert_state(const char *fun, struct vsb *s, int state) _assert_vsb_state(const char *fun, struct vsb *s, int state)
{ {
(void)fun; (void)fun;
...@@ -99,11 +99,11 @@ _vsb_assert_state(const char *fun, struct vsb *s, int state) ...@@ -99,11 +99,11 @@ _vsb_assert_state(const char *fun, struct vsb *s, int state)
("%s called with %sfinished or corrupt vsb", fun, ("%s called with %sfinished or corrupt vsb", fun,
(state ? "un" : ""))); (state ? "un" : "")));
} }
#define vsb_assert_integrity(s) _vsb_assert_integrity(__func__, (s)) #define assert_vsb_integrity(s) _assert_vsb_integrity(__func__, (s))
#define vsb_assert_state(s, i) _vsb_assert_state(__func__, (s), (i)) #define assert_vsb_state(s, i) _assert_vsb_state(__func__, (s), (i))
#else #else
#define vsb_assert_integrity(s) do { } while (0) #define assert_vsb_integrity(s) do { } while (0)
#define vsb_assert_state(s, i) do { } while (0) #define assert_vsb_state(s, i) do { } while (0)
#endif #endif
static int static int
...@@ -195,7 +195,7 @@ void ...@@ -195,7 +195,7 @@ void
vsb_clear(struct vsb *s) vsb_clear(struct vsb *s)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
/* don't care if it's finished or not */ /* don't care if it's finished or not */
VSB_CLEARFLAG(s, VSB_FINISHED); VSB_CLEARFLAG(s, VSB_FINISHED);
...@@ -211,8 +211,8 @@ int ...@@ -211,8 +211,8 @@ int
vsb_setpos(struct vsb *s, int pos) vsb_setpos(struct vsb *s, int pos)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, 0); assert_vsb_state(s, 0);
KASSERT(pos >= 0, KASSERT(pos >= 0,
("attempt to seek to a negative position (%d)", pos)); ("attempt to seek to a negative position (%d)", pos));
...@@ -233,8 +233,8 @@ vsb_bcat(struct vsb *s, const void *buf, size_t len) ...@@ -233,8 +233,8 @@ vsb_bcat(struct vsb *s, const void *buf, size_t len)
{ {
const char *str = buf; const char *str = buf;
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, 0); assert_vsb_state(s, 0);
if (VSB_HASOVERFLOWED(s)) if (VSB_HASOVERFLOWED(s))
return (-1); return (-1);
...@@ -257,8 +257,8 @@ int ...@@ -257,8 +257,8 @@ int
vsb_bcpy(struct vsb *s, const void *buf, size_t len) vsb_bcpy(struct vsb *s, const void *buf, size_t len)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, 0); assert_vsb_state(s, 0);
vsb_clear(s); vsb_clear(s);
return (vsb_bcat(s, buf, len)); return (vsb_bcat(s, buf, len));
...@@ -271,8 +271,8 @@ int ...@@ -271,8 +271,8 @@ int
vsb_cat(struct vsb *s, const char *str) vsb_cat(struct vsb *s, const char *str)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, 0); assert_vsb_state(s, 0);
if (VSB_HASOVERFLOWED(s)) if (VSB_HASOVERFLOWED(s))
return (-1); return (-1);
...@@ -296,8 +296,8 @@ int ...@@ -296,8 +296,8 @@ int
vsb_cpy(struct vsb *s, const char *str) vsb_cpy(struct vsb *s, const char *str)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, 0); assert_vsb_state(s, 0);
vsb_clear(s); vsb_clear(s);
return (vsb_cat(s, str)); return (vsb_cat(s, str));
...@@ -312,8 +312,8 @@ vsb_vprintf(struct vsb *s, const char *fmt, va_list ap) ...@@ -312,8 +312,8 @@ vsb_vprintf(struct vsb *s, const char *fmt, va_list ap)
va_list ap_copy; va_list ap_copy;
int len; int len;
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, 0); assert_vsb_state(s, 0);
KASSERT(fmt != NULL, KASSERT(fmt != NULL,
("%s called with a NULL format string", __func__)); ("%s called with a NULL format string", __func__));
...@@ -372,8 +372,8 @@ int ...@@ -372,8 +372,8 @@ int
vsb_putc(struct vsb *s, int c) vsb_putc(struct vsb *s, int c)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, 0); assert_vsb_state(s, 0);
if (VSB_HASOVERFLOWED(s)) if (VSB_HASOVERFLOWED(s))
return (-1); return (-1);
...@@ -393,8 +393,8 @@ int ...@@ -393,8 +393,8 @@ int
vsb_trim(struct vsb *s) vsb_trim(struct vsb *s)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, 0); assert_vsb_state(s, 0);
if (VSB_HASOVERFLOWED(s)) if (VSB_HASOVERFLOWED(s))
return (-1); return (-1);
...@@ -422,8 +422,8 @@ void ...@@ -422,8 +422,8 @@ void
vsb_finish(struct vsb *s) vsb_finish(struct vsb *s)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, 0); assert_vsb_state(s, 0);
s->s_buf[s->s_len] = '\0'; s->s_buf[s->s_len] = '\0';
VSB_CLEARFLAG(s, VSB_OVERFLOWED); VSB_CLEARFLAG(s, VSB_OVERFLOWED);
...@@ -437,8 +437,8 @@ char * ...@@ -437,8 +437,8 @@ char *
vsb_data(struct vsb *s) vsb_data(struct vsb *s)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
vsb_assert_state(s, VSB_FINISHED); assert_vsb_state(s, VSB_FINISHED);
return (s->s_buf); return (s->s_buf);
} }
...@@ -450,7 +450,7 @@ int ...@@ -450,7 +450,7 @@ int
vsb_len(struct vsb *s) vsb_len(struct vsb *s)
{ {
vsb_assert_integrity(s); assert_vsb_integrity(s);
/* don't care if it's finished or not */ /* don't care if it's finished or not */
if (VSB_HASOVERFLOWED(s)) if (VSB_HASOVERFLOWED(s))
...@@ -466,7 +466,7 @@ vsb_delete(struct vsb *s) ...@@ -466,7 +466,7 @@ vsb_delete(struct vsb *s)
{ {
int isdyn; int isdyn;
vsb_assert_integrity(s); assert_vsb_integrity(s);
/* don't care if it's finished or not */ /* don't care if it's finished or not */
if (VSB_ISDYNAMIC(s)) if (VSB_ISDYNAMIC(s))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment