mirror
/
darkhttpd
mirror of https://github.com/emikulic/darkhttpd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

. Version upped to 1.1 for append buffer optimizations. 

. Don't keep the apbuf strings null-terminated.
. Compile-time optimise append() if we have GCC.
This commit is contained in:
Emil Mikulic 2003-12-13 08:42:34 +00:00
parent fd4e271d57
commit 4ce4eabdbd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
trunk/darkhttpd.c
View File

@ -28,7 +28,7 @@
* DAMAGE. * DAMAGE.
*/ */
static const char pkgname[] = "darkhttpd/1.0"; static const char pkgname[] = "darkhttpd/1.1";
static const char copyright[] = "copyright (c) 2003 Emil Mikulic"; static const char copyright[] = "copyright (c) 2003 Emil Mikulic";
static const char rcsid[] = static const char rcsid[] =
"$Id$"; "$Id$";
@ -329,7 +329,8 @@ static void *xrealloc(void *original, const size_t size)
/* --------------------------------------------------------------------------- /* ---------------------------------------------------------------------------
* strdup() that errx()s if it can't allocate. * strdup() that errx()s if it can't allocate. Do this by hand since strdup()
* isn't C89.
*/ */
static char *xstrdup(const char *src) static char *xstrdup(const char *src)
{ {
@ -409,23 +410,28 @@ static struct apbuf *make_apbuf(void)
static void appendl(struct apbuf *buf, const char *s, const size_t len) static void appendl(struct apbuf *buf, const char *s, const size_t len)
{ {
if (buf->pool <= buf->length + len) if (buf->pool < buf->length + len)
{ {
/* pool has dried up */ /* pool has dried up */
while (buf->pool <= buf->length + len) buf->pool += APBUF_GROW; while (buf->pool < buf->length + len) buf->pool += APBUF_GROW;
buf->str = xrealloc(buf->str, buf->pool); buf->str = xrealloc(buf->str, buf->pool);
} }
memcpy(buf->str + buf->length, s, len+1); memcpy(buf->str + buf->length, s, len);
buf->length += len; buf->length += len;
} }
#ifdef __GNUC__
#define append(buf, s) appendl(buf, s, \
(__builtin_constant_p(s) ? sizeof(s)-1 : strlen(s)) )
#else
static void append(struct apbuf *buf, const char *s) static void append(struct apbuf *buf, const char *s)
{ {
appendl(buf, s, strlen(s)); appendl(buf, s, strlen(s));
} }
#endif