the obligatory undo-a-change-before release commit

I had constified struct vmod_blobdigest_digest just before release,
which does not work. I have not understood why this did not show up as a
compile error before.
parent a67d5569
......@@ -149,15 +149,15 @@ tus_checksums(void)
*/
struct tus_chksum {
unsigned magic;
#define VMOD_TUS_CHKSUM_MAGIC 0x105c6650
const struct vmod_blobdigest_digest *digest;
VCL_BLOB expect;
VCL_BLOB final;
unsigned magic;
#define VMOD_TUS_CHKSUM_MAGIC 0x105c6650
struct vmod_blobdigest_digest *digest;
VCL_BLOB expect;
VCL_BLOB final;
};
/* tus hash names to blobdiget object */
const struct vmod_blobdigest_digest *
struct vmod_blobdigest_digest *
tus_hash(const char *s, size_t l)
{
if (enabled == 0 || s == NULL)
......@@ -173,7 +173,7 @@ tus_hash(const char *s, size_t l)
}
struct tus_chksum *
tus_chksum_new(VRT_CTX, const struct vmod_blobdigest_digest *d)
tus_chksum_new(VRT_CTX, struct vmod_blobdigest_digest *d)
{
struct tus_chksum *r;
......@@ -193,7 +193,7 @@ tus_chksum_new(VRT_CTX, const struct vmod_blobdigest_digest *d)
struct tus_chksum *
tus_chksum_hdr(VRT_CTX, const char *hdr)
{
const struct vmod_blobdigest_digest *d;
struct vmod_blobdigest_digest *d;
struct tus_chksum *r;
VCL_BLOB expect;
const char *sep;
......
int tus_chksum_init(VRT_CTX);
int tus_chksum_fini(VRT_CTX);
const struct vmod_blobdigest_digest *tus_hash(const char *, size_t);
struct tus_chksum *tus_chksum_new(VRT_CTX,
const struct vmod_blobdigest_digest *);
struct vmod_blobdigest_digest *tus_hash(const char *, size_t);
struct tus_chksum *tus_chksum_new(VRT_CTX, struct vmod_blobdigest_digest *);
struct tus_chksum *tus_chksum_hdr(VRT_CTX, const char *);
void tus_chksum_update(VRT_CTX, struct tus_chksum *c,
const void *ptr, size_t l);
......
......@@ -246,7 +246,7 @@ VCL_BLOB
tus_concat_hash(VRT_CTX, const struct VPFX(tus_server) *srv,
const struct tus_concat *concat)
{
const struct vmod_blobdigest_digest *d;
struct vmod_blobdigest_digest *d;
struct tus_chksum *c;
struct tus_file_core *part;
unsigned i;
......
......@@ -16,6 +16,6 @@ VCL_DURATION tus_server_expires(const struct VPFX(tus_server) *);
void tus_server_lock(struct VPFX(tus_server) *);
void tus_server_unlock(struct VPFX(tus_server) *);
VCL_BYTES tus_server_max(const struct VPFX(tus_server) *s);
const struct vmod_blobdigest_digest * tus_server_digest(
struct vmod_blobdigest_digest * tus_server_digest(
const struct VPFX(tus_server) *s);
struct tus_exp *tus_server_exp(const struct VPFX(tus_server) *);
......@@ -76,7 +76,7 @@ tus_server_max(const struct VPFX(tus_server) *s)
return (s->max);
}
const struct vmod_blobdigest_digest *
struct vmod_blobdigest_digest *
tus_server_digest(const struct VPFX(tus_server) *s)
{
CHECK_OBJ_NOTNULL(s, VMOD_TUS_SERVER_MAGIC);
......
......@@ -24,7 +24,7 @@ struct VPFX(tus_server) {
VCL_DURATION expires;
int basefd;
struct tus_files files[1];
const struct vmod_blobdigest_digest *digest;
struct vmod_blobdigest_digest *digest;
struct tus_exp *exp;
};
......
......@@ -206,7 +206,7 @@ VCL_VOID
tus_server__init(VRT_CTX, struct VPFX(tus_server) **tussrvp,
const char *vcl_name, struct VARGS(server__init) *args)
{
const struct vmod_blobdigest_digest *d = NULL;
struct vmod_blobdigest_digest *d = NULL;
struct VPFX(tus_server) *tussrv, needle[1];
AN(tussrvp);
......
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