httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Alexei Kosut <ako...@hyperreal.org>
Subject cvs commit: apache/src/regex regcomp.c regerror.c regex.h regex2.h regexec.c regfree.c
Date Wed, 16 Jul 1997 00:41:29 GMT
akosut      97/07/15 17:41:28

  Modified:    src       conf.h http_core.c http_core.h util_snprintf.c
               src/regex  regcomp.c regerror.c regex.h regex2.h regexec.c
                        regfree.c
  Log:
  Add a few more API_EXPORT tags. Also ensure that regex.h is correctly
  recreated when mkh is used.
  
  Revision  Changes    Path
  1.115     +2 -1      apache/src/conf.h
  
  Index: conf.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/conf.h,v
  retrieving revision 1.114
  retrieving revision 1.115
  diff -c -C3 -r1.114 -r1.115
  *** conf.h	1997/07/15 22:36:49	1.114
  --- conf.h	1997/07/16 00:41:20	1.115
  ***************
  *** 634,640 ****
    #define ap_vsnprintf    vsnprintf
    #else
    API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...);
  ! int ap_vsnprintf(char *buf, size_t len, const char *format, va_list ap);
    #endif
    
    #if !defined(NEXT) && !defined(CONVEXOS) && !defined(WIN32)
  --- 634,641 ----
    #define ap_vsnprintf    vsnprintf
    #else
    API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...);
  ! API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
  ! 			     va_list ap);
    #endif
    
    #if !defined(NEXT) && !defined(CONVEXOS) && !defined(WIN32)
  
  
  
  1.96      +5 -6      apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.95
  retrieving revision 1.96
  diff -c -C3 -r1.95 -r1.96
  *** http_core.c	1997/07/15 22:36:50	1.95
  --- http_core.c	1997/07/16 00:41:21	1.96
  ***************
  *** 251,257 ****
        return conf->opts; 
    } 
    
  ! int allow_overrides (request_rec *r) 
    { 
        core_dir_config *conf = 
          (core_dir_config *)get_module_config(r->per_dir_config, &core_module); 
  --- 251,257 ----
        return conf->opts; 
    } 
    
  ! API_EXPORT(int) allow_overrides (request_rec *r) 
    { 
        core_dir_config *conf = 
          (core_dir_config *)get_module_config(r->per_dir_config, &core_module); 
  ***************
  *** 259,265 ****
        return conf->override; 
    } 
    
  ! char *auth_type (request_rec *r)
    {
        core_dir_config *conf = 
          (core_dir_config *)get_module_config(r->per_dir_config, &core_module); 
  --- 259,265 ----
        return conf->override; 
    } 
    
  ! API_EXPORT(char *) auth_type (request_rec *r)
    {
        core_dir_config *conf = 
          (core_dir_config *)get_module_config(r->per_dir_config, &core_module); 
  ***************
  *** 267,273 ****
        return conf->auth_type;
    }
    
  ! char *auth_name (request_rec *r)
    {
        core_dir_config *conf = 
          (core_dir_config *)get_module_config(r->per_dir_config, &core_module); 
  --- 267,273 ----
        return conf->auth_type;
    }
    
  ! API_EXPORT(char *) auth_name (request_rec *r)
    {
        core_dir_config *conf = 
          (core_dir_config *)get_module_config(r->per_dir_config, &core_module); 
  ***************
  *** 283,289 ****
        return conf->default_type ? conf->default_type : DEFAULT_TYPE;
    }
    
  ! char *document_root (request_rec *r) /* Don't use this!!! */
    {
        core_server_config *conf = 
          (core_server_config *)get_module_config(r->server->module_config,
  --- 283,289 ----
        return conf->default_type ? conf->default_type : DEFAULT_TYPE;
    }
    
  ! API_EXPORT(char *) document_root (request_rec *r) /* Don't use this!!! */
    {
        core_server_config *conf = 
          (core_server_config *)get_module_config(r->server->module_config,
  ***************
  *** 387,394 ****
        }
    }
    
  ! const char *
  ! get_remote_logname(request_rec *r)
    {
        core_dir_config *dir_conf;
    
  --- 387,393 ----
        }
    }
    
  ! API_EXPORT(const char *) get_remote_logname(request_rec *r)
    {
        core_dir_config *dir_conf;
    
  
  
  
  1.24      +5 -5      apache/src/http_core.h
  
  Index: http_core.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -c -C3 -r1.23 -r1.24
  *** http_core.h	1997/07/15 22:36:50	1.23
  --- http_core.h	1997/07/16 00:41:21	1.24
  ***************
  *** 83,97 ****
    #define SATISFY_NOSPEC 2
    
    API_EXPORT(int) allow_options (request_rec *);
  ! int allow_overrides (request_rec *);
    API_EXPORT(char *) default_type (request_rec *);     
  ! char *document_root (request_rec *); /* Don't use this!  If your request went
    				      * through a Userdir, or something like
    				      * that, it'll screw you.  But it's
    				      * back-compatible...
    				      */
    API_EXPORT(const char *) get_remote_host(conn_rec *conn, void *dir_config, int type);
  ! extern const char *get_remote_logname(request_rec *r);
         
    /* Authentication stuff.  This is one of the places where compatibility
     * with the old config files *really* hurts; they don't discriminate at
  --- 83,97 ----
    #define SATISFY_NOSPEC 2
    
    API_EXPORT(int) allow_options (request_rec *);
  ! API_EXPORT(int) allow_overrides (request_rec *);
    API_EXPORT(char *) default_type (request_rec *);     
  ! API_EXPORT(char *) document_root (request_rec *); /* Don't use this!  If your request
went
    				      * through a Userdir, or something like
    				      * that, it'll screw you.  But it's
    				      * back-compatible...
    				      */
    API_EXPORT(const char *) get_remote_host(conn_rec *conn, void *dir_config, int type);
  ! API_EXPORT(const char *) get_remote_logname(request_rec *r);
         
    /* Authentication stuff.  This is one of the places where compatibility
     * with the old config files *really* hurts; they don't discriminate at
  ***************
  *** 105,112 ****
        char *requirement;
    } require_line;
         
  ! char *auth_type (request_rec *);
  ! char *auth_name (request_rec *);     
    API_EXPORT(int) satisfies (request_rec *r);
    API_EXPORT(array_header *) requires (request_rec *);    
    
  --- 105,112 ----
        char *requirement;
    } require_line;
         
  ! API_EXPORT(char *) auth_type (request_rec *);
  ! API_EXPORT(char *) auth_name (request_rec *);     
    API_EXPORT(int) satisfies (request_rec *r);
    API_EXPORT(array_header *) requires (request_rec *);    
    
  
  
  
  1.7       +3 -2      apache/src/util_snprintf.c
  
  Index: util_snprintf.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/util_snprintf.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -c -C3 -r1.6 -r1.7
  *** util_snprintf.c	1997/06/29 17:49:02	1.6
  --- util_snprintf.c	1997/07/16 00:41:22	1.7
  ***************
  *** 926,932 ****
    }
    
    
  ! int ap_snprintf(char *buf, size_t len, const char *format,...)
    {
        int cc;
        va_list ap;
  --- 926,932 ----
    }
    
    
  ! API_EXPORT(int) ap_snprintf(char *buf, size_t len, const char *format,...)
    {
        int cc;
        va_list ap;
  ***************
  *** 938,944 ****
    }
    
    
  ! int ap_vsnprintf(char *buf, size_t len, const char *format, va_list ap)
    {
        int cc;
    
  --- 938,945 ----
    }
    
    
  ! API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
  ! 			     va_list ap)
    {
        int cc;
    
  
  
  
  1.4       +2 -2      apache/src/regex/regcomp.c
  
  Index: regcomp.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/regex/regcomp.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -c -C3 -r1.3 -r1.4
  *** regcomp.c	1997/02/17 04:52:41	1.3
  --- regcomp.c	1997/07/16 00:41:24	1.4
  ***************
  *** 72,78 ****
    
    /*
     - regcomp - interface for parser and compilation
  !  = extern int regcomp(regex_t *, const char *, int);
     = #define	REG_BASIC	0000
     = #define	REG_EXTENDED	0001
     = #define	REG_ICASE	0002
  --- 72,78 ----
    
    /*
     - regcomp - interface for parser and compilation
  !  = API_EXPORT(int) regcomp(regex_t *, const char *, int);
     = #define	REG_BASIC	0000
     = #define	REG_EXTENDED	0001
     = #define	REG_ICASE	0002
  ***************
  *** 82,88 ****
     = #define	REG_PEND	0040
     = #define	REG_DUMP	0200
     */
  ! int				/* 0 success, otherwise REG_something */
    regcomp(preg, pattern, cflags)
    regex_t *preg;
    const char *pattern;
  --- 82,88 ----
     = #define	REG_PEND	0040
     = #define	REG_DUMP	0200
     */
  ! API_EXPORT(int)			/* 0 success, otherwise REG_something */
    regcomp(preg, pattern, cflags)
    regex_t *preg;
    const char *pattern;
  
  
  
  1.3       +2 -2      apache/src/regex/regerror.c
  
  Index: regerror.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/regex/regerror.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -c -C3 -r1.2 -r1.3
  *** regerror.c	1997/02/17 04:52:41	1.2
  --- regerror.c	1997/07/16 00:41:24	1.3
  ***************
  *** 55,64 ****
    
    /*
     - regerror - the interface to error numbers
  !  = extern size_t regerror(int, const regex_t *, char *, size_t);
     */
    /* ARGSUSED */
  ! size_t
    regerror(errcode, preg, errbuf, errbuf_size)
    int errcode;
    const regex_t *preg;
  --- 55,64 ----
    
    /*
     - regerror - the interface to error numbers
  !  = API_EXPORT(size_t) regerror(int, const regex_t *, char *, size_t);
     */
    /* ARGSUSED */
  ! API_EXPORT(size_t)
    regerror(errcode, preg, errbuf, errbuf_size)
    int errcode;
    const regex_t *preg;
  
  
  
  1.4       +4 -4      apache/src/regex/regex.h
  
  Index: regex.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/regex/regex.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -c -C3 -r1.3 -r1.4
  *** regex.h	1997/07/14 10:01:37	1.3
  --- regex.h	1997/07/16 00:41:25	1.4
  ***************
  *** 5,17 ****
    extern "C" {
    #endif
    
    #ifdef WIN32
    #define API_EXPORT(type)    __declspec(dllexport) type __stdcall
    #else
    #define API_EXPORT(type)    type
    #endif
    
  - /* === regex2.h === */
    typedef off_t regoff_t;
    typedef struct {
    	int re_magic;
  --- 5,17 ----
    extern "C" {
    #endif
    
  + /* === regex2.h === */
    #ifdef WIN32
    #define API_EXPORT(type)    __declspec(dllexport) type __stdcall
    #else
    #define API_EXPORT(type)    type
    #endif
    
    typedef off_t regoff_t;
    typedef struct {
    	int re_magic;
  ***************
  *** 26,32 ****
    
    
    /* === regcomp.c === */
  ! extern int regcomp(regex_t *, const char *, int);
    #define	REG_BASIC	0000
    #define	REG_EXTENDED	0001
    #define	REG_ICASE	0002
  --- 26,32 ----
    
    
    /* === regcomp.c === */
  ! API_EXPORT(int) regcomp(regex_t *, const char *, int);
    #define	REG_BASIC	0000
    #define	REG_EXTENDED	0001
    #define	REG_ICASE	0002
  ***************
  *** 56,62 ****
    #define	REG_INVARG	16
    #define	REG_ATOI	255	/* convert name to number (!) */
    #define	REG_ITOA	0400	/* convert number to name (!) */
  ! extern size_t regerror(int, const regex_t *, char *, size_t);
    
    
    /* === regexec.c === */
  --- 56,62 ----
    #define	REG_INVARG	16
    #define	REG_ATOI	255	/* convert name to number (!) */
    #define	REG_ITOA	0400	/* convert number to name (!) */
  ! API_EXPORT(size_t) regerror(int, const regex_t *, char *, size_t);
    
    
    /* === regexec.c === */
  ***************
  *** 70,76 ****
    
    
    /* === regfree.c === */
  ! extern void regfree(regex_t *);
    
    #ifdef __cplusplus
    }
  --- 70,76 ----
    
    
    /* === regfree.c === */
  ! API_EXPORT(void) regfree(regex_t *);
    
    #ifdef __cplusplus
    }
  
  
  
  1.4       +6 -0      apache/src/regex/regex2.h
  
  Index: regex2.h
  ===================================================================
  RCS file: /export/home/cvs/apache/src/regex/regex2.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -c -C3 -r1.3 -r1.4
  *** regex2.h	1997/02/17 04:52:41	1.3
  --- regex2.h	1997/07/16 00:41:25	1.4
  ***************
  *** 1,5 ****
  --- 1,11 ----
    /*
     * First, the stuff that ends up in the outside-world include file
  +  = #ifdef WIN32
  +  = #define API_EXPORT(type)    __declspec(dllexport) type __stdcall
  +  = #else
  +  = #define API_EXPORT(type)    type
  +  = #endif
  +  =
     = typedef off_t regoff_t;
     = typedef struct {
     = 	int re_magic;
  
  
  
  1.4       +1 -1      apache/src/regex/regexec.c
  
  Index: regexec.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/regex/regexec.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -c -C3 -r1.3 -r1.4
  *** regexec.c	1997/07/13 19:01:37	1.3
  --- regexec.c	1997/07/16 00:41:25	1.4
  ***************
  *** 98,104 ****
    
    /*
     - regexec - interface for matching
  !  = extern int regexec(const regex_t *, const char *, size_t, \
     =					regmatch_t [], int);
     = #define	REG_NOTBOL	00001
     = #define	REG_NOTEOL	00002
  --- 98,104 ----
    
    /*
     - regexec - interface for matching
  !  = API_EXPORT(int) regexec(const regex_t *, const char *, size_t, \
     =					regmatch_t [], int);
     = #define	REG_NOTBOL	00001
     = #define	REG_NOTEOL	00002
  
  
  
  1.2       +2 -2      apache/src/regex/regfree.c
  
  Index: regfree.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/regex/regfree.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -c -C3 -r1.1 -r1.2
  *** regfree.c	1996/07/23 22:06:47	1.1
  --- regfree.c	1997/07/16 00:41:26	1.2
  ***************
  *** 8,16 ****
    
    /*
     - regfree - free everything
  !  = extern void regfree(regex_t *);
     */
  ! void
    regfree(preg)
    regex_t *preg;
    {
  --- 8,16 ----
    
    /*
     - regfree - free everything
  !  = API_EXPORT(void) regfree(regex_t *);
     */
  ! API_EXPORT(void)
    regfree(preg)
    regex_t *preg;
    {
  
  
  

Mime
View raw message