Permalink
Browse files

remove... now in apr 1.5

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1528438 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent dcecf7b commit a0686677c673a248aabd4e0965e3311206cf8678 @jimjag jimjag committed Oct 2, 2013
Showing with 2 additions and 764 deletions.
  1. +0 −2 CHANGES
  2. +0 −19 LICENSE
  3. +0 −82 include/ap_skiplist.h
  4. +2 −2 server/Makefile.in
  5. +0 −659 server/skiplist.c
View
@@ -58,8 +58,6 @@ Changes with Apache 2.4.7
*) modules: Fix some compiler warnings. [Guenter Knauf]
- *) skiplist: Add skiplist capability to httpd [Jim Jagielski]
-
*) Sync 2.4 and trunk
- Avoid some memory allocation and work when TRACE1 is not activated
- fix typo in include guard
View
@@ -544,24 +544,5 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-for the server/skiplist.c component:
-
-/* ======================================================================
- * Copyright (c) 2000,2006 Theo Schlossnagle
- * All rights reserved.
- * The following code was written by Theo Schlossnagle for use in the
- * Backhand project at The Center for Networking and Distributed Systems
- * at The Johns Hopkins University.
- *
- * This is a skiplist implementation to be used for abstract structures
- * and is release under the LGPL license version 2.1 or later. A copy
- * of this license can be found file LGPL.
- *
- * Alternatively, this file may be licensed under the new BSD license.
- * A copy of this license can be found file BSD.
- *
- * ======================================================================
- */
-
====================================================================
View
@@ -1,82 +0,0 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _AP_SKIPLIST_P_H
-#define _AP_SKIPLIST_P_H
-
-#include "apr.h"
-#include "apr_portable.h"
-#include "ap_config.h"
-#include "httpd.h"
-
-/* This is the function type that must be implemented per object type
- that is used in a skiplist for comparisons to maintain order */
-typedef int (*ap_skiplist_compare) (void *, void *);
-typedef void (*ap_skiplist_freefunc) (void *);
-
-struct ap_skiplist;
-struct ap_skiplistnode;
-
-typedef struct ap_skiplistnode ap_skiplistnode;
-typedef struct ap_skiplist ap_skiplist;
-
-AP_DECLARE(void *) ap_skiplist_alloc(ap_skiplist *sl, size_t size);
-
-AP_DECLARE(void) ap_skiplist_free(ap_skiplist *sl, void *mem);
-
-AP_DECLARE(apr_status_t) ap_skiplist_init(ap_skiplist **sl, apr_pool_t *p);
-
-AP_DECLARE(void) ap_skiplist_set_compare(ap_skiplist *sl, ap_skiplist_compare,
- ap_skiplist_compare);
-
-AP_DECLARE(void) ap_skiplist_add_index(ap_skiplist *sl, ap_skiplist_compare,
- ap_skiplist_compare);
-
-AP_DECLARE(ap_skiplistnode *) ap_skiplist_getlist(ap_skiplist *sl);
-
-AP_DECLARE(void *) ap_skiplist_find_compare(ap_skiplist *sl,
- void *data,
- ap_skiplistnode **iter,
- ap_skiplist_compare func);
-
-AP_DECLARE(void *) ap_skiplist_find(ap_skiplist *sl, void *data, ap_skiplistnode **iter);
-
-AP_DECLARE(void *) ap_skiplist_next(ap_skiplist *sl, ap_skiplistnode **iter);
-
-AP_DECLARE(void *) ap_skiplist_previous(ap_skiplist *sl, ap_skiplistnode **iter);
-
-
-AP_DECLARE(ap_skiplistnode *) ap_skiplist_insert_compare(ap_skiplist *sl,
- void *data, ap_skiplist_compare comp);
-
-AP_DECLARE(ap_skiplistnode *) ap_skiplist_insert(ap_skiplist* sl, void *data);
-
-AP_DECLARE(int) ap_skiplist_remove_compare(ap_skiplist *sl, void *data,
- ap_skiplist_freefunc myfree, ap_skiplist_compare comp);
-
-AP_DECLARE(int) ap_skiplist_remove(ap_skiplist *sl, void *data, ap_skiplist_freefunc myfree);
-
-AP_DECLARE(void) ap_skiplist_remove_all(ap_skiplist *sl, ap_skiplist_freefunc myfree);
-
-AP_DECLARE(void) ap_skiplist_destroy(ap_skiplist *sl, ap_skiplist_freefunc myfree);
-
-AP_DECLARE(void *) ap_skiplist_pop(ap_skiplist *a, ap_skiplist_freefunc myfree);
-
-AP_DECLARE(void *) ap_skiplist_peek(ap_skiplist *a);
-
-AP_DECLARE(ap_skiplist *) ap_skiplist_merge(ap_skiplist *sl1, ap_skiplist *sl2);
-
-#endif
View
@@ -14,8 +14,8 @@ LTLIBRARY_SOURCES = \
util_filter.c util_pcre.c util_regex.c exports.c \
scoreboard.c error_bucket.c protocol.c core.c request.c provider.c \
eoc_bucket.c eor_bucket.c core_filters.c \
- util_expr_parse.c util_expr_scan.c util_expr_eval.c \
- skiplist.c
+ util_expr_parse.c util_expr_scan.c util_expr_eval.c
+
LTLIBRARY_DEPENDENCIES = test_char.h
TARGETS = delete-exports $(LTLIBRARY_NAME) $(CORE_IMPLIB_FILE) export_vars.h httpd.exp
Oops, something went wrong.

0 comments on commit a068667

Please sign in to comment.