From bee95331f6fcb6a94a27cd523c57bdb956fa81a2 Mon Sep 17 00:00:00 2001 From: Greg Stein Date: Sat, 25 Nov 2000 23:35:06 +0000 Subject: [PATCH] fix spelling: "writable" is the proper form git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87079 13f79535-47bb-0310-9956-ffa450edef68 --- modules/dav/fs/repos.c | 10 +++++----- modules/dav/main/mod_dav.h | 8 ++++---- modules/dav/main/props.c | 10 +++++----- modules/dav/main/std_liveprop.c | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c index 9118fc6b7a..e9c5e9161c 100644 --- a/modules/dav/fs/repos.c +++ b/modules/dav/fs/repos.c @@ -184,7 +184,7 @@ static const dav_liveprop_spec dav_fs_props[] = DAV_FS_URI_MYPROPS, "executable", DAV_PROPID_FS_executable, - 0 /* handled special in dav_fs_is_writeable */ + 0 /* handled special in dav_fs_is_writable */ }, { 0 } /* sentinel */ @@ -1730,7 +1730,7 @@ static dav_prop_insert dav_fs_insert_prop(const dav_resource *resource, ** exist. Just bail for this case. ** ** Even though we state that the FS properties are not defined, the - ** client cannot store dead values -- we deny that thru the is_writeable + ** client cannot store dead values -- we deny that thru the is_writable ** hook function. */ if (!resource->exists) @@ -1815,12 +1815,12 @@ static dav_prop_insert dav_fs_insert_prop(const dav_resource *resource, return which; } -static int dav_fs_is_writeable(const dav_resource *resource, int propid) +static int dav_fs_is_writable(const dav_resource *resource, int propid) { const dav_liveprop_spec *info; #ifndef WIN32 - /* this property is not usable (writeable) on the Win32 platform */ + /* this property is not usable (writable) on the Win32 platform */ if (propid == DAV_PROPID_FS_executable && !resource->collection) return 1; #endif @@ -1968,7 +1968,7 @@ static dav_error *dav_fs_patch_rollback(dav_resource *resource, static const dav_hooks_liveprop dav_hooks_liveprop_fs = { dav_fs_insert_prop, - dav_fs_is_writeable, + dav_fs_is_writable, dav_fs_namespace_uris, dav_fs_patch_validate, dav_fs_patch_exec, diff --git a/modules/dav/main/mod_dav.h b/modules/dav/main/mod_dav.h index 808b555dab..67e714581d 100644 --- a/modules/dav/main/mod_dav.h +++ b/modules/dav/main/mod_dav.h @@ -199,7 +199,7 @@ DAV_DECLARE(dav_error*) dav_push_error(apr_pool_t *p, int status, int error_id, /* Prop DB errors */ #define DAV_ERR_PROP_BAD_MAJOR 200 /* major version was wrong */ #define DAV_ERR_PROP_READONLY 201 /* prop is read-only */ -#define DAV_ERR_PROP_NO_DATABASE 202 /* writeable db not avail */ +#define DAV_ERR_PROP_NO_DATABASE 202 /* writable db not avail */ #define DAV_ERR_PROP_NOT_FOUND 203 /* prop not found */ #define DAV_ERR_PROP_BAD_LOCKDB 204 /* could not open lockdb */ #define DAV_ERR_PROP_OPENING 205 /* problem opening propdb */ @@ -696,14 +696,14 @@ struct dav_hooks_liveprop ap_text_header *phdr); /* - ** Determine whether a given property is writeable. + ** Determine whether a given property is writable. ** ** ### we may want a different semantic. i.e. maybe it should be ** ### "can we write into this property?" ** ** Returns 1 if the live property can be written, 0 if read-only. */ - int (*is_writeable)(const dav_resource *resource, int propid); + int (*is_writable)(const dav_resource *resource, int propid); /* ** This member defines the set of namespace URIs that the provider @@ -785,7 +785,7 @@ typedef struct { int propid; /* provider-local property ID */ - int is_writable; /* is the property writeable? */ + int is_writable; /* is the property writable? */ } dav_liveprop_spec; diff --git a/modules/dav/main/props.c b/modules/dav/main/props.c index 8e9c6fd4c6..08a50b3f80 100644 --- a/modules/dav/main/props.c +++ b/modules/dav/main/props.c @@ -185,7 +185,7 @@ #include "apr_strings.h" /* -** There is some rough support for writeable DAV:getcontenttype and +** There is some rough support for writable DAV:getcontenttype and ** DAV:getcontentlanguage properties. If this #define is (1), then ** this support is disabled. ** @@ -195,7 +195,7 @@ ** values for the response. ** (Handling the PUT would not be difficult, though) */ -#define DAV_DISABLE_WRITEABLE_PROPS 1 +#define DAV_DISABLE_WRITABLE_PROPS 1 #define DAV_GDBM_NS_KEY "METADATA" #define DAV_GDBM_NS_KEY_LEN 8 @@ -368,12 +368,12 @@ static int dav_rw_liveprop(dav_propdb *propdb, dav_elem_private *priv) ** Check the liveprop provider (if this is a provider-defined prop) */ if (priv->provider != NULL) { - return (*priv->provider->is_writeable)(propdb->resource, propid); + return (*priv->provider->is_writable)(propdb->resource, propid); } /* these are defined as read-only */ if (propid == DAV_PROPID_CORE_lockdiscovery -#if DAV_DISABLE_WRITEABLE_PROPS +#if DAV_DISABLE_WRITABLE_PROPS || propid == DAV_PROPID_CORE_getcontenttype || propid == DAV_PROPID_CORE_getcontentlanguage #endif @@ -1323,7 +1323,7 @@ void dav_prop_validate(dav_prop_ctx *ctx) /* ** The property is supposed to be stored into the dead-property - ** database. Make sure the thing is truly open (and writeable). + ** database. Make sure the thing is truly open (and writable). */ if (propdb->deferred && (ctx->err = dav_really_open_db(propdb, 0 /* ro */)) != NULL) { diff --git a/modules/dav/main/std_liveprop.c b/modules/dav/main/std_liveprop.c index a7acd24c29..0f7d26e0a6 100644 --- a/modules/dav/main/std_liveprop.c +++ b/modules/dav/main/std_liveprop.c @@ -244,7 +244,7 @@ static dav_error * dav_core_patch_validate(const dav_resource *resource, int operation, void **context, int *defer_to_dead) { - /* all of our writeable props go in the dead prop database */ + /* all of our writable props go in the dead prop database */ *defer_to_dead = 1; return NULL; -- 2.50.1