Mailing List Archive

commit 5598410656eaa2149d31af8fd421faea5a6f45f8
Author: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Tue Jan 11 10:52:53 2022 +0000

Polish

diff --git a/bin/varnishd/storage/mgt_storage_persistent.c b/bin/varnishd/storage/mgt_storage_persistent.c
index f8d797f85..f6bf48a8e 100644
--- a/bin/varnishd/storage/mgt_storage_persistent.c
+++ b/bin/varnishd/storage/mgt_storage_persistent.c
@@ -137,7 +137,7 @@ smp_metrics(struct smp_sc *sc)
* Set up persistent storage silo in the master process.
*/

-void
+void v_matchproto_(storage_init_f)
smp_mgt_init(struct stevedore *parent, int ac, char * const *av)
{
struct smp_sc *sc;
diff --git a/bin/varnishd/storage/storage.h b/bin/varnishd/storage/storage.h
index e6c0a0cfd..b9017f579 100644
--- a/bin/varnishd/storage/storage.h
+++ b/bin/varnishd/storage/storage.h
@@ -78,45 +78,44 @@ typedef void sml_free_f(struct storage *);
/*--------------------------------------------------------------------*/

struct stevedore {
- unsigned magic;
-#define STEVEDORE_MAGIC 0x4baf43db
- const char *name;
+ unsigned magic;
+#define STEVEDORE_MAGIC 0x4baf43db
+ const char *name;

/* Called in MGT process */
- storage_init_f *init;
+ storage_init_f *init;

/* Called in cache process
* only allocobj is required, other callbacks are optional
*/
- storage_open_f *open;
- storage_close_f *close;
- storage_allocobj_f *allocobj;
- storage_baninfo_f *baninfo;
- storage_banexport_f *banexport;
- storage_panic_f *panic;
- storage_allocbuf_f *allocbuf;
- storage_freebuf_f *freebuf;
+ storage_open_f *open;
+ storage_close_f *close;
+ storage_allocobj_f *allocobj;
+ storage_baninfo_f *baninfo;
+ storage_banexport_f *banexport;
+ storage_panic_f *panic;
+ storage_allocbuf_f *allocbuf;
+ storage_freebuf_f *freebuf;

/* Only if SML is used */
- sml_alloc_f *sml_alloc;
- sml_free_f *sml_free;
- sml_getobj_f *sml_getobj;
+ sml_alloc_f *sml_alloc;
+ sml_free_f *sml_free;
+ sml_getobj_f *sml_getobj;

- const struct obj_methods
- *methods;
+ const struct obj_methods *methods;

/* Only if LRU is used */
- struct lru *lru;
+ struct lru *lru;

#define VRTSTVVAR(nm, vtype, ctype, dval) stv_var_##nm *var_##nm;
#include "tbl/vrt_stv_var.h"

/* private fields for the stevedore */
- void *priv;
+ void *priv;

VTAILQ_ENTRY(stevedore) list;
- const char *ident;
- const char *vclname;
+ const char *ident;
+ const char *vclname;
};

extern struct stevedore *stv_transient;
diff --git a/bin/varnishd/storage/storage_debug.c b/bin/varnishd/storage/storage_debug.c
index 9086ebd0f..1ab497e50 100644
--- a/bin/varnishd/storage/storage_debug.c
+++ b/bin/varnishd/storage/storage_debug.c
@@ -51,7 +51,7 @@ smd_lsp_getspace(struct worker *wrk, struct objcore *oc, ssize_t *sz,
return (SML_methods.objgetspace(wrk, oc, sz, ptr));
}

-static void
+static void v_matchproto_(storage_init_f)
smd_init(struct stevedore *parent, int aac, char * const *aav)
{
struct obj_methods *methods;
diff --git a/bin/varnishd/storage/storage_file.c b/bin/varnishd/storage/storage_file.c
index ba7009078..8c692d106 100644
--- a/bin/varnishd/storage/storage_file.c
+++ b/bin/varnishd/storage/storage_file.c
@@ -113,7 +113,7 @@ struct smf_sc {

/*--------------------------------------------------------------------*/

-static void
+static void v_matchproto_(storage_init_f)
smf_init(struct stevedore *parent, int ac, char * const *av)
{
const char *size, *fn, *r;
diff --git a/bin/varnishd/storage/storage_malloc.c b/bin/varnishd/storage/storage_malloc.c
index cf0bf2544..fb7345271 100644
--- a/bin/varnishd/storage/storage_malloc.c
+++ b/bin/varnishd/storage/storage_malloc.c
@@ -171,7 +171,7 @@ sma_free_space(const struct stevedore *st)
return (sma_sc->sma_max - sma_sc->sma_alloc);
}

-static void
+static void v_matchproto_(storage_init_f)
sma_init(struct stevedore *parent, int ac, char * const *av)
{
const char *e;
diff --git a/bin/varnishd/storage/storage_umem.c b/bin/varnishd/storage/storage_umem.c
index 2535d1171..2df9f345f 100644
--- a/bin/varnishd/storage/storage_umem.c
+++ b/bin/varnishd/storage/storage_umem.c
@@ -289,7 +289,7 @@ smu_umem_loaded(void)
return (0);
}

-static void
+static void v_matchproto_(storage_init_f)
smu_init(struct stevedore *parent, int ac, char * const *av)
{
static int inited = 0;
_______________________________________________
varnish-commit mailing list
varnish-commit@varnish-cache.org
https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit