httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@hyperreal.org
Subject cvs commit: apache-2.0/src/include ap.h
Date Wed, 17 Nov 1999 15:28:36 GMT
rbb         99/11/17 07:28:34

  Modified:    src/include ap.h
  Log:
  Simple cleanup to remove the functions that now reside in APR.
  
  Revision  Changes    Path
  1.5       +0 -95     apache-2.0/src/include/ap.h
  
  Index: ap.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ap.h	1999/10/10 14:32:28	1.4
  +++ ap.h	1999/11/17 15:28:31	1.5
  @@ -67,15 +67,6 @@
   extern "C" {
   #endif
   
  -API_EXPORT(char *) ap_cpystrn(char *, const char *, size_t);
  -APRFile ap_slack(APRFile, int);
  -int ap_execle(const char *, const char *, ...);
  -int ap_execve(const char *, const char *argv[], const char *envp[]);
  -#if 0
  -/* Moved down to APR XXXXX */
  -API_EXPORT(int) ap_getpass(const char *prompt, char *pwbuf, size_t bufsiz);
  -#endif
  -
   /* small utility macros to make things easier to read */
   
   /*
  @@ -89,86 +80,6 @@
   #endif
   #endif */ /* WIN32 */
   
  -/* ap_vformatter() is a generic printf-style formatting routine
  - * with some extensions.  The extensions are:
  - *
  - * %pA	takes a struct in_addr *, and prints it as a.b.c.d
  - * %pI	takes a struct sockaddr_in * and prints it as a.b.c.d:port
  - * %pp  takes a void * and outputs it in hex
  - *
  - * The %p hacks are to force gcc's printf warning code to skip
  - * over a pointer argument without complaining.  This does
  - * mean that the ANSI-style %p (output a void * in hex format) won't
  - * work as expected at all, but that seems to be a fair trade-off
  - * for the increased robustness of having printf-warnings work.
  - *
  - * Additionally, ap_vformatter allows for arbitrary output methods
  - * using the ap_vformatter_buff and flush_func.
  - *
  - * The ap_vformatter_buff has two elements curpos and endpos.
  - * curpos is where ap_vformatter will write the next byte of output.
  - * It proceeds writing output to curpos, and updating curpos, until
  - * either the end of output is reached, or curpos == endpos (i.e. the
  - * buffer is full).
  - *
  - * If the end of output is reached, ap_vformatter returns the
  - * number of bytes written.
  - *
  - * When the buffer is full, the flush_func is called.  The flush_func
  - * can return -1 to indicate that no further output should be attempted,
  - * and ap_vformatter will return immediately with -1.  Otherwise
  - * the flush_func should flush the buffer in whatever manner is
  - * appropriate, re ap_context_t nitialize curpos and endpos, and return 0.
  - *
  - * Note that flush_func is only invoked as a result of attempting to
  - * write another byte at curpos when curpos >= endpos.  So for
  - * example, it's possible when the output exactly matches the buffer
  - * space available that curpos == endpos will be true when
  - * ap_vformatter returns.
  - *
  - * ap_vformatter does not call out to any other code, it is entirely
  - * self-contained.  This allows the callers to do things which are
  - * otherwise "unsafe".  For example, ap_psprintf uses the "scratch"
  - * space at the unallocated end of a block, and doesn't actually
  - * complete the allocation until ap_vformatter returns.  ap_psprintf
  - * would be completely broken if ap_vformatter were to call anything
  - * that used a pool.  Similarly http_bprintf() uses the "scratch"
  - * space at the end of its output buffer, and doesn't actually note
  - * that the space is in use until it either has to flush the buffer
  - * or until ap_vformatter returns.
  - */
  -#if 0
  -/* All this moved down to APR XXXXX */
  -
  -typedef struct {
  -    char *curpos;
  -    char *endpos;
  -} ap_vformatter_buff;
  -
  -API_EXPORT(int) ap_vformatter(int (*flush_func)(ap_vformatter_buff *),
  -    ap_vformatter_buff *, const char *fmt, va_list ap);
  -
  -/* These are snprintf implementations based on ap_vformatter().
  - *
  - * Note that various standards and implementations disagree on the return
  - * value of snprintf, and side-effects due to %n in the formatting string.
  - * ap_snprintf behaves as follows:
  - *
  - * Process the format string until the entire string is exhausted, or
  - * the buffer fills.  If the buffer fills then stop processing immediately
  - * (so no further %n arguments are processed), and return the buffer
  - * length.  In all cases the buffer is NUL terminated.
  - *
  - * In no event does ap_snprintf return a negative number.  It's not possible
  - * to distinguish between an output which was truncated, and an output which
  - * exactly filled the buffer.
  - */
  -API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...)
  -			    __attribute__((format(printf,3,4)));
  -API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
  -			     va_list ap);
  -#endif
  -
   /* Simple BASE64 encode/decode functions.
    * 
    * As we might encode binary strings, hence we require the length of
  @@ -188,12 +99,6 @@
   API_EXPORT(int) ap_base64decode_len(const char * coded_src);
   API_EXPORT(int) ap_base64decode(char * plain_dst, const char *coded_src);
   API_EXPORT(int) ap_base64decode_binary(unsigned char * plain_dst, const char *coded_src);
  -
  -/* Password validation, as used in AuthType Basic which is able to cope
  - * (based on the prexix) with the SHA1, Apache's internal MD5 and (depending
  - * on your platform either plain or crypt(3) passwords.
  - */
  -API_EXPORT(char *) ap_validate_password(const char *passwd, const char *hash);
   
   #ifdef __cplusplus
   }
  
  
  

Mime
View raw message