REORG: include: move istbuf.h to haproxy/

This one now relies on two files that were already cleaned up and is
only used by buffer.h.
This commit is contained in:
Willy Tarreau 2020-05-27 17:32:53 +02:00
parent 8dabda7497
commit f0f1c80daf
3 changed files with 9 additions and 8 deletions

View File

@ -30,7 +30,7 @@
#include <haproxy/buf.h>
#include <common/chunk.h>
#include <import/ist.h>
#include <common/istbuf.h>
#include <haproxy/istbuf.h>
#include <common/memory.h>
#include <proto/activity.h>

View File

@ -1,8 +1,8 @@
/*
* include/common/istbuf.h
* include/haproxy/istbuf.h
* Functions used to manipulate indirect strings with wrapping buffers.
*
* Copyright (C) 2000-2018 Willy Tarreau - w@1wt.eu
* Copyright (C) 2000-2020 Willy Tarreau - w@1wt.eu
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -25,12 +25,12 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef _COMMON_ISTBUF_H
#define _COMMON_ISTBUF_H
#ifndef _HAPROXY_ISTBUF_H
#define _HAPROXY_ISTBUF_H
#include <inttypes.h>
#include <haproxy/buf.h>
#include <sys/types.h>
#include <import/ist.h>
#include <haproxy/buf.h>
/* b_isteq() : returns > 0 if the first <n> characters of buffer <b> starting
@ -152,7 +152,7 @@ static inline struct buffer ist2buf(const struct ist ist)
return buf;
}
#endif /* _COMMON_ISTBUF_H */
#endif /* _HAPROXY_ISTBUF_H */
/*
* Local variables:

View File

@ -26,6 +26,7 @@
#include <common/fcgi.h>
#include <haproxy/buf.h>
#include <haproxy/istbuf.h>
/* Encodes header of a FCGI record into the chunk <out>. It returns non-zero on
* success and 0 on failure (buffer full). <out> is a chunk, so the wrapping is