Commit 2f407d89 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp

Constify most stevedore pointers.

parent 5a1cdf99
......@@ -382,7 +382,7 @@ struct lru {
struct storeobj {
unsigned magic;
#define STOREOBJ_MAGIC 0x6faed850
struct stevedore *stevedore;
const struct stevedore *stevedore;
void *priv;
uintptr_t priv2;
};
......@@ -1092,7 +1092,7 @@ void RFC2616_Vary_AE(struct http *hp);
/* stevedore.c */
int STV_NewObject(struct objcore *, struct worker *,
const char *hint, unsigned len);
struct storage *STV_alloc(struct stevedore *, size_t size);
struct storage *STV_alloc(const struct stevedore *, size_t size);
void STV_trim(struct storage *st, size_t size, int move_ok);
void STV_free(struct storage *st);
void STV_open(void);
......
......@@ -214,7 +214,7 @@ ObjIterEnd(struct objcore *oc, void **oix)
*/
static struct storage *
objallocwithnuke(struct stevedore *stv, struct worker *wrk, size_t size)
objallocwithnuke(const struct stevedore *stv, struct worker *wrk, size_t size)
{
struct storage *st = NULL;
unsigned fail;
......
......@@ -154,7 +154,7 @@ stv_pick_stevedore(struct vsl_log *vsl, const char **hint)
/*-------------------------------------------------------------------*/
struct storage *
STV_alloc(struct stevedore *stv, size_t size)
STV_alloc(const struct stevedore *stv, size_t size)
{
struct storage *st;
......@@ -190,7 +190,7 @@ STV_alloc(struct stevedore *stv, size_t size)
*/
struct object *
STV_MkObject(struct stevedore *stv, struct objcore *oc, void *ptr)
STV_MkObject(const struct stevedore *stv, struct objcore *oc, void *ptr)
{
struct object *o;
......@@ -218,7 +218,8 @@ STV_MkObject(struct stevedore *stv, struct objcore *oc, void *ptr)
*/
int
stv_default_allocobj(struct stevedore *stv, struct objcore *oc, unsigned ltot)
stv_default_allocobj(const struct stevedore *stv, struct objcore *oc,
unsigned ltot)
{
struct object *o;
struct storage *st;
......
......@@ -48,7 +48,7 @@ struct storage {
VTAILQ_ENTRY(storage) list;
struct stevedore *stevedore;
const struct stevedore *stevedore;
void *priv;
unsigned char *ptr;
......@@ -132,10 +132,10 @@ struct storeobj_methods {
typedef void storage_init_f(struct stevedore *, int ac, char * const *av);
typedef void storage_open_f(const struct stevedore *);
typedef struct storage *storage_alloc_f(struct stevedore *, size_t size);
typedef struct storage *storage_alloc_f(const struct stevedore *, size_t size);
typedef void storage_trim_f(struct storage *, size_t size, int move_ok);
typedef void storage_free_f(struct storage *);
typedef int storage_allocobj_f(struct stevedore *, struct objcore *,
typedef int storage_allocobj_f(const struct stevedore *, struct objcore *,
unsigned ltot);
typedef void storage_close_f(const struct stevedore *);
typedef void storage_signal_close_f(const struct stevedore *);
......@@ -196,7 +196,8 @@ extern struct stevedore *stv_transient;
int STV_GetFile(const char *fn, int *fdp, const char **fnp, const char *ctx);
uintmax_t STV_FileSize(int fd, const char *size, unsigned *granularity,
const char *ctx);
struct object *STV_MkObject(struct stevedore *, struct objcore *, void *ptr);
struct object *STV_MkObject(const struct stevedore *, struct objcore *,
void *ptr);
struct lru *LRU_Alloc(void);
void LRU_Free(struct lru *lru);
......
......@@ -438,7 +438,7 @@ smf_open(const struct stevedore *st)
/*--------------------------------------------------------------------*/
static struct storage *
smf_alloc(struct stevedore *st, size_t size)
smf_alloc(const struct stevedore *st, size_t size)
{
struct smf *smf;
struct smf_sc *sc;
......
......@@ -57,7 +57,7 @@ struct sma {
};
static struct storage *
sma_alloc(struct stevedore *st, size_t size)
sma_alloc(const struct stevedore *st, size_t size)
{
struct sma_sc *sma_sc;
struct sma *sma = NULL;
......
......@@ -423,7 +423,7 @@ smp_close(const struct stevedore *st)
*/
static struct storage *
smp_allocx(struct stevedore *st, size_t min_size, size_t max_size,
smp_allocx(const struct stevedore *st, size_t min_size, size_t max_size,
struct smp_object **so, unsigned *idx, struct smp_seg **ssg)
{
struct smp_sc *sc;
......@@ -504,7 +504,7 @@ smp_allocx(struct stevedore *st, size_t min_size, size_t max_size,
*/
static int
smp_allocobj(struct stevedore *stv, struct objcore *oc, unsigned ltot)
smp_allocobj(const struct stevedore *stv, struct objcore *oc, unsigned ltot)
{
struct object *o;
struct storage *st;
......@@ -557,7 +557,7 @@ smp_allocobj(struct stevedore *stv, struct objcore *oc, unsigned ltot)
*/
static struct storage *
smp_alloc(struct stevedore *st, size_t size)
smp_alloc(const struct stevedore *st, size_t size)
{
return (smp_allocx(st,
......
......@@ -51,7 +51,7 @@ struct smu {
};
static struct storage *
smu_alloc(struct stevedore *st, size_t size)
smu_alloc(const struct stevedore *st, size_t size)
{
struct smu *smu;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment