cvs commit: apache-2.0/src/lib/apr/include apr_mmap.h

1999-11-03 Thread dreid
dreid   99/11/03 04:33:34

  Modified:src/lib/apr/include apr_mmap.h
  Log:
  Add the new functions and also argument names :-)
  
  Revision  ChangesPath
  1.2   +11 -9 apache-2.0/src/lib/apr/include/apr_mmap.h
  
  Index: apr_mmap.h
  ===
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_mmap.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apr_mmap.h1999/10/21 20:36:45 1.1
  +++ apr_mmap.h1999/11/03 12:33:32 1.2
  @@ -69,17 +69,19 @@
   typedef struct mmap_tap_mmap_t;
   
   /*   Function definitions */
  -ap_status_t ap_mmap_create(ap_mmap_t **, const char *, ap_context_t *);
  -ap_status_t ap_mmap_open_create(ap_mmap_t **, ap_file_t *, ap_context_t *);
  -ap_status_t ap_mmap_delete(ap_mmap_t *);
   
  -ap_status_t ap_read_mmap(char *, ap_ssize_t *, ap_ssize_t *, 
  -ap_ssize_t *, ap_mmap_t *, ap_context_t *);
  -ap_status_t ap_send_mmap(ap_socket_t *, ap_ssize_t *, ap_ssize_t *, 
  -ap_mmap_t *, ap_context_t *);
  +/* creation */
  +ap_status_t ap_mmap_create(ap_mmap_t ** newmmap, const char *fname, 
ap_context_t *cntxt);
  +ap_status_t ap_mmap_open_create(ap_mmap_t **newmmap, ap_file_t *file, 
ap_context_t *cntxt);
   
  -ap_status_t ap_first_mmap(struct mmap_t *, ap_context_t *);
  -ap_status_t ap_next_mmap(struct mmap_t *, struct mmap_t *, ap_context_t *);
  +/* destruction */
  +ap_status_t ap_mmap_delete(ap_mmap_t *mmap);
  +
  +/* These are designed to be used in qsort, bsearch etc */
  +ap_int32_t ap_mmap_inode_compare(const void *m1, const void *m2);
  +ap_int32_t ap_mmap_filename_compare(const void *m1, const void *m2);
  +
  +ap_status_t ap_mmap_offset(void **addr, ap_mmap_t *mmap, ap_size_t offset);
   
   #ifdef __cplusplus
   }
  
  
  


cvs commit: apache-2.0/src/lib/apr/include apr_mmap.h

1999-10-21 Thread dreid
dreid   99/10/21 13:36:46

  Added:   src/lib/apr/include apr_mmap.h
  Log:
  OK, here is the file I missed form the mmap commit last night.
  
  Revision  ChangesPath
  1.1  apache-2.0/src/lib/apr/include/apr_mmap.h
  
  Index: apr_mmap.h
  ===
  /* 
   * Copyright (c) 1999 The Apache Group.  All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer. 
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. All advertising materials mentioning features or use of this
   *software must display the following acknowledgment:
   *This product includes software developed by the Apache Group
   *for use in the Apache HTTP server project (http://www.apache.org/).
   *
   * 4. The names Apache Server and Apache Group must not be used to
   *endorse or promote products derived from this software without
   *prior written permission. For written permission, please contact
   *[EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called Apache
   *nor may Apache appear in their names without prior written
   *permission of the Apache Group.
   *
   * 6. Redistributions of any form whatsoever must retain the following
   *acknowledgment:
   *This product includes software developed by the Apache Group
   *for use in the Apache HTTP server project (http://www.apache.org/).
   *
   * THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
   * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
   * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
   * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE APACHE GROUP OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
   * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
   * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
   * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
   * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
   * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
   * OF THE POSSIBILITY OF SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Group.
   * For more information on the Apache Group and the Apache HTTP server
   * project, please see http://www.apache.org/.
   *
   */
  
  #ifndef APR_MMAP_H
  #define APR_MMAP_H
  
  #include apr_general.h
  #include apr_errno.h
  #include apr_network_io.h
  #include apr_portable.h
  
  #ifdef __cplusplus
  extern C {
  #endif /* __cplusplus */
  
  
  typedef struct mmap_tap_mmap_t;
  
  /*   Function definitions */
  ap_status_t ap_mmap_create(ap_mmap_t **, const char *, ap_context_t *);
  ap_status_t ap_mmap_open_create(ap_mmap_t **, ap_file_t *, ap_context_t *);
  ap_status_t ap_mmap_delete(ap_mmap_t *);
  
  ap_status_t ap_read_mmap(char *, ap_ssize_t *, ap_ssize_t *, 
  ap_ssize_t *, ap_mmap_t *, ap_context_t *);
  ap_status_t ap_send_mmap(ap_socket_t *, ap_ssize_t *, ap_ssize_t *, 
  ap_mmap_t *, ap_context_t *);
  
  ap_status_t ap_first_mmap(struct mmap_t *, ap_context_t *);
  ap_status_t ap_next_mmap(struct mmap_t *, struct mmap_t *, ap_context_t *);
  
  #ifdef __cplusplus
  }
  #endif
  
  #endif  /* ! APR_MMAP_H */