Changeset 4475

Timestamp:

01/20/10 13:26:29 (6 months ago)

Author:

phk

Message:

Various flexelint silencings.

Location:

trunk/varnish-cache

Files:

• bin/varnishd/cache.h (modified) (2 diffs)
• bin/varnishd/cache_dir_random.c (modified) (1 diff)
• bin/varnishd/cache_http.c (modified) (10 diffs)
• bin/varnishd/flint.lnt (modified) (1 diff)
• bin/varnishd/mgt_vcc.c (modified) (3 diffs)
• bin/varnishd/stevedore.h (modified) (2 diffs)
• bin/varnishd/stevedore_utils.c (modified) (3 diffs)
• bin/varnishd/varnishd.c (modified) (2 diffs)
• include/vbm.h (modified) (2 diffs)
• lib/libvcl/vcc_compile.c (modified) (2 diffs)
• lib/libvcl/vcc_compile.h (modified) (1 diff)

trunk/varnish-cache/bin/varnishd/cache.h

@@ -515 +515 @@
 void http_ClrHeader(struct http *to);
 unsigned http_Write(struct worker *w, const struct http *hp, int resp);
-void http_CopyResp(struct http *to, const struct http *fm);
-void http_SetResp(struct http *to, const char *proto, const char *status,
+void http_CopyResp(const struct http *to, const struct http *fm);
+void http_SetResp(const struct http *to, const char *proto, const char *status,
     const char *response);
 void http_FilterFields(struct worker *w, int fd, struct http *to,
     const struct http *fm, unsigned how);
 void http_FilterHeader(const struct sess *sp, unsigned how);
-void http_PutProtocol(struct worker *w, int fd, struct http *to,
+void http_PutProtocol(struct worker *w, int fd, const struct http *to,
     const char *protocol);
 void http_PutStatus(struct worker *w, int fd, struct http *to, int status);
-void http_PutResponse(struct worker *w, int fd, struct http *to,
+void http_PutResponse(struct worker *w, int fd, const struct http *to,
     const char *response);
 void http_PrintfHeader(struct worker *w, int fd, struct http *to,
     const char *fmt, ...);
 void http_SetHeader(struct worker *w, int fd, struct http *to, const char *hdr);
-void http_SetH(struct http *to, unsigned n, const char *fm);
-void http_ForceGet(struct http *to);
+void http_SetH(const struct http *to, unsigned n, const char *fm);
+void http_ForceGet(const struct http *to);
 void http_Setup(struct http *ht, struct ws *ws);
 int http_GetHdr(const struct http *hp, const char *hdr, char **ptr);
@@ -541 +541 @@
 int http_DissectResponse(struct worker *w, const struct http_conn *htc,
     struct http *sp);
-const char *http_DoConnection(struct http *hp);
-void http_CopyHome(struct worker *w, int fd, struct http *hp);
+const char *http_DoConnection(const struct http *hp);
+void http_CopyHome(struct worker *w, int fd, const struct http *hp);
 void http_Unset(struct http *hp, const char *hdr);
 

trunk/varnish-cache/bin/varnishd/cache_dir_random.c

@@ -87 +87 @@
         struct vdi_random *vs;
         double r, s1;
-        unsigned u;
+        unsigned u = 0;
         struct vbe_conn *vbe;
         struct director *d2;

trunk/varnish-cache/bin/varnishd/cache_http.c

@@ -285 +285 @@
 
 const char *
-http_DoConnection(struct http *hp)
+http_DoConnection(const struct http *hp)
 {
         char *p, *q;
@@ -589 +589 @@
 
 void
-http_SetH(struct http *to, unsigned n, const char *fm)
+http_SetH(const struct http *to, unsigned n, const char *fm)
 {
 
@@ -600 +600 @@
 
 static void
-http_copyh(struct http *to, const struct http *fm, unsigned n)
+http_copyh(const struct http *to, const struct http *fm, unsigned n)
 {
 
@@ -610 +610 @@
 
 void
-http_ForceGet(struct http *to)
+http_ForceGet(const struct http *to)
 {
         if (strcmp(http_GetReq(to), "GET"))
@@ -617 +617 @@
 
 void
-http_CopyResp(struct http *to, const struct http *fm)
+http_CopyResp(const struct http *to, const struct http *fm)
 {
 
@@ -631 +631 @@
 
 void
-http_SetResp(struct http *to, const char *proto, const char *status,
+http_SetResp(const struct http *to, const char *proto, const char *status,
     const char *response)
 {
@@ -743 +743 @@
 
 void
-http_CopyHome(struct worker *w, int fd, struct http *hp)
+http_CopyHome(struct worker *w, int fd, const struct http *hp)
 {
         unsigned u, l;
@@ -802 +802 @@
 
 static void
-http_PutField(struct worker *w, int fd, struct http *to, int field,
+http_PutField(struct worker *w, int fd, const struct http *to, int field,
     const char *string)
 {
@@ -825 +825 @@
 
 void
-http_PutProtocol(struct worker *w, int fd, struct http *to,
+http_PutProtocol(struct worker *w, int fd, const struct http *to,
     const char *protocol)
 {
@@ -844 +844 @@
 
 void
-http_PutResponse(struct worker *w, int fd, struct http *to,
+http_PutResponse(struct worker *w, int fd, const struct http *to,
     const char *response)
 {

trunk/varnish-cache/bin/varnishd/flint.lnt

@@ -40 +40 @@
 -esym(755, VTAILQ_*)
 
+// XXX: I think this is a flexelint bug:
+-esym(522, vbit_clr)
+
 // Stuff used outside varnishd
 -esym(759, BackSlash)

trunk/varnish-cache/bin/varnishd/mgt_vcc.c

@@ -45 +45 @@
 #include <unistd.h>
 
-#include "compat/asprintf.h"
 #include "vsb.h"
 
@@ -357 +356 @@
                 }
 
-                asprintf(&vcl,
+                bprintf(buf,
                     "backend default {\n"
                     "    .host = \"%s\";\n"
@@ -364 +363 @@
                 free(addr);
                 free(port);
+                vcl = strdup(buf);
                 AN(vcl);
                 bprintf(buf, "boot (-b %s)", b_arg);

trunk/varnish-cache/bin/varnishd/stevedore.h

@@ -40 +40 @@
 typedef struct storage *storage_alloc_f(struct stevedore *, size_t size,
     struct objcore *);
-typedef struct object *storage_alloc_obj_f(struct stevedore *, size_t size,
-    double ttl);
 typedef void storage_trim_f(struct storage *, size_t size);
 typedef void storage_free_f(struct storage *);
@@ -55 +53 @@
         storage_open_f          *open;  /* called by cache process */
         storage_alloc_f         *alloc;
-        storage_alloc_obj_f     *allocobj;
         storage_trim_f          *trim;
         storage_free_f          *free;

trunk/varnish-cache/bin/varnishd/stevedore_utils.c

@@ -56 +56 @@
 #endif
 
-#include "compat/asprintf.h"
 #include "mgt.h"
 #include "stevedore.h"
@@ -87 +86 @@
         char *q;
         int retval = 1;
+        char buf[FILENAME_MAX];
 
         AN(fn);
@@ -108 +108 @@
 
         if (S_ISDIR(st.st_mode)) {
-                xxxassert(asprintf(&q, "%s/varnish.XXXXXX", fn) > 0);
-                XXXAN(q);
-                fd = mkstemp(q);
+                bprintf(buf, "%s/varnish.XXXXXX", fn);
+                fd = mkstemp(buf);
                 if (fd < 0)
                         ARGV_ERR("(%s) \"%s\" mkstemp(%s) failed (%s)\n",
                             ctx, fn, q, strerror(errno));
-                *fnp = q;
+                *fnp = strdup(buf);
+                AN(*fnp);
                 retval = 2;
         } else if (S_ISREG(st.st_mode)) {

trunk/varnish-cache/bin/varnishd/varnishd.c

@@ -50 +50 @@
 #include <unistd.h>
 
-#include "compat/asprintf.h"
 #include "compat/daemon.h"
 
@@ -439 +438 @@
         uintptr_t a;
         struct symbols *s;
-        int i;
-
-        p = NULL;
-        i = asprintf(&p, "nm -an %s 2>/dev/null", a0);
-        if (i < 0 || p == NULL)
-                return;
-        fi = popen(p, "r");
-        free(p);
+
+        bprintf(buf, "nm -an %s 2>/dev/null", a0);
+        fi = popen(buf, "r");
         if (fi == NULL)
                 return;

trunk/varnish-cache/include/vbm.h

@@ -86 +86 @@
 
 static inline void
-vbit_clr(struct vbitmap *vb, unsigned bit)
+vbit_clr(const struct vbitmap *vb, unsigned bit)
 {
 
@@ -94 +94 @@
 
 static inline int
-vbit_test(struct vbitmap *vb, unsigned bit)
+vbit_test(const struct vbitmap *vb, unsigned bit)
 {
 

trunk/varnish-cache/lib/libvcl/vcc_compile.c

@@ -97 +97 @@
 /*--------------------------------------------------------------------*/
 
-void
-TlFree(struct tokenlist *tl, void *p)
+static void
+TlDoFree(struct tokenlist *tl, void *p)
 {
         struct membit *mb;
@@ -116 +116 @@
         p = calloc(len, 1);
         assert(p != NULL);
-        TlFree(tl, p);
+        TlDoFree(tl, p);
         return (p);
 }

trunk/varnish-cache/lib/libvcl/vcc_compile.h

@@ -177 +177 @@
 void EncToken(struct vsb *sb, const struct token *t);
 int IsMethod(const struct token *t);
-void TlFree(struct tokenlist *tl, void *p);
 void *TlAlloc(struct tokenlist *tl, unsigned len);