backout name change:
apr_bucket_notimpl_setaside -> apr_bucket_setaside_notimpl
apr_bucket_notimpl_split -> apr_bucket_split_notimpl
apr_bucket_notimpl_copy -> apr_bucket_copy_notimpl
apr_bucket_notimpl_destroy -> apr_bucket_destroy_notimpl
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/apr/apr-util/trunk@58102 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/buckets/apr_buckets.c b/buckets/apr_buckets.c
index d116a4b..f65f8fa 100644
--- a/buckets/apr_buckets.c
+++ b/buckets/apr_buckets.c
@@ -96,20 +96,20 @@
return bucket_types->nelts - 1;
}
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_notimpl_setaside(apr_bucket *data)
+APU_DECLARE_NONSTD(apr_status_t) apr_bucket_setaside_notimpl(apr_bucket *data)
{
return APR_ENOTIMPL;
}
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_notimpl_split(apr_bucket *data, apr_off_t point)
+APU_DECLARE_NONSTD(apr_status_t) apr_bucket_split_notimpl(apr_bucket *data, apr_off_t point)
{
return APR_ENOTIMPL;
}
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_notimpl_copy(apr_bucket *e, apr_bucket **c)
+APU_DECLARE_NONSTD(apr_status_t) apr_bucket_copy_notimpl(apr_bucket *e, apr_bucket **c)
{
return APR_ENOTIMPL;
}
-APU_DECLARE_NONSTD(void) apr_bucket_notimpl_destroy(void *data)
+APU_DECLARE_NONSTD(void) apr_bucket_destroy_notimpl(void *data)
{
return;
}
diff --git a/buckets/apr_buckets_eos.c b/buckets/apr_buckets_eos.c
index 3333fb7..78d70c2 100644
--- a/buckets/apr_buckets_eos.c
+++ b/buckets/apr_buckets_eos.c
@@ -86,9 +86,9 @@
APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_eos = {
"EOS", 5,
- apr_bucket_notimpl_destroy,
+ apr_bucket_destroy_notimpl,
eos_read,
- apr_bucket_notimpl_setaside,
- apr_bucket_notimpl_split,
+ apr_bucket_setaside_notimpl,
+ apr_bucket_split_notimpl,
eos_copy
};
diff --git a/buckets/apr_buckets_file.c b/buckets/apr_buckets_file.c
index f319d25..c1bb2ff 100644
--- a/buckets/apr_buckets_file.c
+++ b/buckets/apr_buckets_file.c
@@ -209,7 +209,7 @@
"FILE", 5,
file_destroy,
file_read,
- apr_bucket_notimpl_setaside,
+ apr_bucket_setaside_notimpl,
apr_bucket_shared_split,
apr_bucket_shared_copy
};
diff --git a/buckets/apr_buckets_flush.c b/buckets/apr_buckets_flush.c
index 2e20e4c..0494594 100644
--- a/buckets/apr_buckets_flush.c
+++ b/buckets/apr_buckets_flush.c
@@ -86,9 +86,9 @@
APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_flush = {
"FLUSH", 5,
- apr_bucket_notimpl_destroy,
+ apr_bucket_destroy_notimpl,
flush_read,
- apr_bucket_notimpl_setaside,
- apr_bucket_notimpl_split,
+ apr_bucket_setaside_notimpl,
+ apr_bucket_split_notimpl,
flush_copy
};
diff --git a/buckets/apr_buckets_heap.c b/buckets/apr_buckets_heap.c
index 11ab0ed..6c4a07a 100644
--- a/buckets/apr_buckets_heap.c
+++ b/buckets/apr_buckets_heap.c
@@ -135,7 +135,7 @@
"HEAP", 5,
heap_destroy,
heap_read,
- apr_bucket_notimpl_setaside,
+ apr_bucket_setaside_notimpl,
apr_bucket_shared_split,
apr_bucket_shared_copy
};
diff --git a/buckets/apr_buckets_mmap.c b/buckets/apr_buckets_mmap.c
index 3766fe0..41bd37b 100644
--- a/buckets/apr_buckets_mmap.c
+++ b/buckets/apr_buckets_mmap.c
@@ -122,7 +122,7 @@
"MMAP", 5,
mmap_destroy,
mmap_read,
- apr_bucket_notimpl_setaside,
+ apr_bucket_setaside_notimpl,
apr_bucket_shared_split,
apr_bucket_shared_copy
};
diff --git a/buckets/apr_buckets_pipe.c b/buckets/apr_buckets_pipe.c
index b585e1e..db9f015 100644
--- a/buckets/apr_buckets_pipe.c
+++ b/buckets/apr_buckets_pipe.c
@@ -141,9 +141,9 @@
APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_pipe = {
"PIPE", 5,
- apr_bucket_notimpl_destroy,
+ apr_bucket_destroy_notimpl,
pipe_read,
- apr_bucket_notimpl_setaside,
- apr_bucket_notimpl_split,
- apr_bucket_notimpl_copy
+ apr_bucket_setaside_notimpl,
+ apr_bucket_split_notimpl,
+ apr_bucket_copy_notimpl
};
diff --git a/buckets/apr_buckets_pool.c b/buckets/apr_buckets_pool.c
index 985617f..2526901 100644
--- a/buckets/apr_buckets_pool.c
+++ b/buckets/apr_buckets_pool.c
@@ -136,7 +136,7 @@
"POOL", 5,
pool_destroy,
pool_read,
- apr_bucket_notimpl_setaside,
+ apr_bucket_setaside_notimpl,
apr_bucket_shared_split,
apr_bucket_shared_copy
};
diff --git a/buckets/apr_buckets_simple.c b/buckets/apr_buckets_simple.c
index 26c320e..dea619c 100644
--- a/buckets/apr_buckets_simple.c
+++ b/buckets/apr_buckets_simple.c
@@ -194,7 +194,7 @@
"IMMORTAL", 5,
free,
simple_read,
- apr_bucket_notimpl_setaside,
+ apr_bucket_setaside_notimpl,
simple_split,
simple_copy
};
diff --git a/buckets/apr_buckets_socket.c b/buckets/apr_buckets_socket.c
index 60d1242..696e2b1 100644
--- a/buckets/apr_buckets_socket.c
+++ b/buckets/apr_buckets_socket.c
@@ -139,9 +139,9 @@
APU_DECLARE_DATA const apr_bucket_type_t apr_bucket_type_socket = {
"SOCKET", 5,
- apr_bucket_notimpl_destroy,
+ apr_bucket_destroy_notimpl,
socket_read,
- apr_bucket_notimpl_setaside,
- apr_bucket_notimpl_split,
- apr_bucket_notimpl_copy
+ apr_bucket_setaside_notimpl,
+ apr_bucket_split_notimpl,
+ apr_bucket_copy_notimpl
};
diff --git a/include/apr_buckets.h b/include/apr_buckets.h
index 632ead6..c1cc4cf 100644
--- a/include/apr_buckets.h
+++ b/include/apr_buckets.h
@@ -800,9 +800,9 @@
* implemented for this bucket
* @param data The bucket to setaside
* @return APR_ENOTIMPL
- * @deffunc apr_status_t apr_bucket_notimpl_setaside(apr_bucket *data)
+ * @deffunc apr_status_t apr_bucket_setaside_notimpl(apr_bucket *data)
*/
-APU_DECLARE_NONSTD(apr_status_t) apr_bucket_notimpl_setaside(apr_bucket *data);
+APU_DECLARE_NONSTD(apr_status_t) apr_bucket_setaside_notimpl(apr_bucket *data);
/**
* A place holder function that signifies that the split function was not
@@ -810,10 +810,10 @@
* @param data The bucket to split
* @param point The location to split the bucket
* @return APR_ENOTIMPL
- * @deffunc apr_status_t apr_bucket_notimpl_split(apr_bucket *data, apr_off_t point)
+ * @deffunc apr_status_t apr_bucket_split_notimpl(apr_bucket *data, apr_off_t point)
*/
APU_DECLARE_NONSTD(apr_status_t)
- apr_bucket_notimpl_split(apr_bucket *data,
+ apr_bucket_split_notimpl(apr_bucket *data,
apr_off_t point);
/**
@@ -822,10 +822,10 @@
* @param e The bucket to copy
* @param c Returns a pointer to the new bucket
* @return APR_ENOTIMPL
- * @deffunc apr_status_t apr_bucket_notimpl_copy(apr_bucket *e, apr_bucket **c)
+ * @deffunc apr_status_t apr_bucket_copy_notimpl(apr_bucket *e, apr_bucket **c)
*/
APU_DECLARE_NONSTD(apr_status_t)
- apr_bucket_notimpl_copy(apr_bucket *e, apr_bucket **c);
+ apr_bucket_copy_notimpl(apr_bucket *e, apr_bucket **c);
/**
* A place holder function that signifies that the destroy function was not
@@ -833,7 +833,7 @@
* @param data The bucket to destroy
* @deffunc void apr_bucket_destroy(apr_bucket *data)
*/
-APU_DECLARE_NONSTD(void) apr_bucket_notimpl_destroy(void *data);
+APU_DECLARE_NONSTD(void) apr_bucket_destroy_notimpl(void *data);
/* There is no apr_bucket_read_notimpl, because it is a required function
*/
