dougm 01/02/13 12:29:56
Modified: modules/http error_bucket.c
buckets apr_buckets.c apr_buckets_eos.c apr_buckets_file.c
apr_buckets_flush.c apr_buckets_heap.c
apr_buckets_mmap.c apr_buckets_pipe.c
apr_buckets_pool.c apr_buckets_simple.c
apr_buckets_socket.c
include apr_buckets.h
Log:
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
Revision Changes Path
1.6 +3 -3 httpd-2.0/modules/http/error_bucket.c
Index: error_bucket.c
===================================================================
RCS file: /home/cvs/httpd-2.0/modules/http/error_bucket.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- error_bucket.c 2001/02/13 20:24:38 1.5
+++ error_bucket.c 2001/02/13 20:29:50 1.6
@@ -98,7 +98,7 @@
"ERROR", 5,
free,
error_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
};
1.47 +4 -4 apr-util/buckets/apr_buckets.c
Index: apr_buckets.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- apr_buckets.c 2001/02/08 07:45:23 1.46
+++ apr_buckets.c 2001/02/13 20:29:51 1.47
@@ -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;
}
1.20 +3 -3 apr-util/buckets/apr_buckets_eos.c
Index: apr_buckets_eos.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_eos.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- apr_buckets_eos.c 2001/02/08 07:45:23 1.19
+++ apr_buckets_eos.c 2001/02/13 20:29:51 1.20
@@ -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
};
1.29 +1 -1 apr-util/buckets/apr_buckets_file.c
Index: apr_buckets_file.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_file.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apr_buckets_file.c 2001/02/08 07:45:23 1.28
+++ apr_buckets_file.c 2001/02/13 20:29:51 1.29
@@ -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
};
1.12 +3 -3 apr-util/buckets/apr_buckets_flush.c
Index: apr_buckets_flush.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_flush.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- apr_buckets_flush.c 2001/02/08 07:45:24 1.11
+++ apr_buckets_flush.c 2001/02/13 20:29:52 1.12
@@ -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
};
1.26 +1 -1 apr-util/buckets/apr_buckets_heap.c
Index: apr_buckets_heap.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_heap.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apr_buckets_heap.c 2001/02/08 07:45:24 1.25
+++ apr_buckets_heap.c 2001/02/13 20:29:52 1.26
@@ -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
};
1.28 +1 -1 apr-util/buckets/apr_buckets_mmap.c
Index: apr_buckets_mmap.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_mmap.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- apr_buckets_mmap.c 2001/02/08 07:45:24 1.27
+++ apr_buckets_mmap.c 2001/02/13 20:29:52 1.28
@@ -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
};
1.29 +4 -4 apr-util/buckets/apr_buckets_pipe.c
Index: apr_buckets_pipe.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_pipe.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- apr_buckets_pipe.c 2001/02/13 20:16:17 1.28
+++ apr_buckets_pipe.c 2001/02/13 20:29:52 1.29
@@ -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
};
1.11 +1 -1 apr-util/buckets/apr_buckets_pool.c
Index: apr_buckets_pool.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_pool.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- apr_buckets_pool.c 2001/02/08 07:45:24 1.10
+++ apr_buckets_pool.c 2001/02/13 20:29:53 1.11
@@ -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
};
1.21 +1 -1 apr-util/buckets/apr_buckets_simple.c
Index: apr_buckets_simple.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_simple.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- apr_buckets_simple.c 2001/02/08 07:45:24 1.20
+++ apr_buckets_simple.c 2001/02/13 20:29:53 1.21
@@ -194,7 +194,7 @@
"IMMORTAL", 5,
free,
simple_read,
- apr_bucket_notimpl_setaside,
+ apr_bucket_setaside_notimpl,
simple_split,
simple_copy
};
1.17 +4 -4 apr-util/buckets/apr_buckets_socket.c
Index: apr_buckets_socket.c
===================================================================
RCS file: /home/cvs/apr-util/buckets/apr_buckets_socket.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- apr_buckets_socket.c 2001/02/08 07:45:24 1.16
+++ apr_buckets_socket.c 2001/02/13 20:29:53 1.17
@@ -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
};
1.77 +7 -7 apr-util/include/apr_buckets.h
Index: apr_buckets.h
===================================================================
RCS file: /home/cvs/apr-util/include/apr_buckets.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- apr_buckets.h 2001/02/13 20:16:19 1.76
+++ apr_buckets.h 2001/02/13 20:29:55 1.77
@@ -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
*/
