From: des Date: Wed, 22 Oct 2008 11:33:58 +0000 (+0000) Subject: Get rid of . X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97104380741ea95b8bb47bbdf5d90f83d9a33766;p=varnish Get rid of . git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@3345 d4fa192b-c00b-0410-8231-f00ffab90ce4 --- diff --git a/varnish-cache/lib/libvarnish/tcp.c b/varnish-cache/lib/libvarnish/tcp.c index ecd18a59..427c469e 100644 --- a/varnish-cache/lib/libvarnish/tcp.c +++ b/varnish-cache/lib/libvarnish/tcp.c @@ -102,7 +102,7 @@ TCP_filter_http(int sock) struct accept_filter_arg afa; int i; - bzero(&afa, sizeof(afa)); + memset(&afa, 0, sizeof(afa)); strcpy(afa.af_name, "httpready"); errno = 0; i = setsockopt(sock, SOL_SOCKET, SO_ACCEPTFILTER, diff --git a/varnish-cache/lib/libvarnish/vsb.c b/varnish-cache/lib/libvarnish/vsb.c index 711054e2..c4a599ab 100644 --- a/varnish-cache/lib/libvarnish/vsb.c +++ b/varnish-cache/lib/libvarnish/vsb.c @@ -36,7 +36,6 @@ #include #include #include -#include #include "libvarnish.h" #include "vsb.h" @@ -137,7 +136,7 @@ vsb_extend(struct vsb *s, int addlen) newbuf = (char *)SBMALLOC(newsize); if (newbuf == NULL) return (-1); - bcopy(s->s_buf, newbuf, s->s_size); + memcpy(newbuf, s->s_buf, s->s_size); if (VSB_ISDYNAMIC(s)) SBFREE(s->s_buf); else @@ -165,12 +164,12 @@ vsb_new(struct vsb *s, char *buf, int length, int flags) s = (struct vsb *)SBMALLOC(sizeof *s); if (s == NULL) return (NULL); - bzero(s, sizeof *s); + memset(s, 0, sizeof *s); s->s_flags = flags; s->s_magic = VSB_MAGIC; VSB_SETFLAG(s, VSB_DYNSTRUCT); } else { - bzero(s, sizeof *s); + memset(s, 0, sizeof *s); s->s_flags = flags; s->s_magic = VSB_MAGIC; } @@ -466,7 +465,7 @@ vsb_delete(struct vsb *s) if (VSB_ISDYNAMIC(s)) SBFREE(s->s_buf); isdyn = VSB_ISDYNSTRUCT(s); - bzero(s, sizeof *s); + memset(s, 0, sizeof *s); if (isdyn) SBFREE(s); } diff --git a/varnish-cache/lib/libvarnishcompat/strndup.c b/varnish-cache/lib/libvarnishcompat/strndup.c index 72bef7ad..201c097b 100644 --- a/varnish-cache/lib/libvarnishcompat/strndup.c +++ b/varnish-cache/lib/libvarnishcompat/strndup.c @@ -36,7 +36,6 @@ #include #include -#include #ifndef HAVE_STRLCPY #include "compat/strlcpy.h"