From 44f33d54fd590d6c7b50d6ef67e69755db5e3ded Mon Sep 17 00:00:00 2001 From: Christophe Jaillet Date: Wed, 4 May 2022 18:27:29 +0000 Subject: [PATCH] dav_get_liveprop_info() returns a long not an int. Update the type of global_ns accordingly and update the format specifier when this variable is used in printf like functions. This also aligns code with dav_core_insert_prop() in modules/dav/main/std_liveprop.c git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1900559 13f79535-47bb-0310-9956-ffa450edef68 --- modules/dav/fs/repos.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c index 1f7379a4d35..d38868c70a1 100644 --- a/modules/dav/fs/repos.c +++ b/modules/dav/fs/repos.c @@ -1926,7 +1926,7 @@ static dav_prop_insert dav_fs_insert_prop(const dav_resource *resource, const char *s; apr_pool_t *p = resource->info->pool; const dav_liveprop_spec *info; - int global_ns; + long global_ns; /* an HTTP-date can be 29 chars plus a null term */ /* a 64-bit size can be 20 chars plus a null term */ @@ -2007,11 +2007,11 @@ static dav_prop_insert dav_fs_insert_prop(const dav_resource *resource, /* DBG3("FS: inserting lp%d:%s (local %d)", ns, scan->name, scan->ns); */ if (what == DAV_PROP_INSERT_VALUE) { - s = apr_psprintf(p, "%s" DEBUG_CR, + s = apr_psprintf(p, "%s" DEBUG_CR, global_ns, info->name, value, global_ns, info->name); } else if (what == DAV_PROP_INSERT_NAME) { - s = apr_psprintf(p, "" DEBUG_CR, global_ns, info->name); + s = apr_psprintf(p, "" DEBUG_CR, global_ns, info->name); } else { /* assert: what == DAV_PROP_INSERT_SUPPORTED */ -- 2.47.2