[Modcplusplus-devel] (johnksterling) mod_cplusplus/include cpp_request.h

[Mod C. C. L. <mod...@so...>]

Mod Cplusplus CVS committal

Author  : johnksterling
Project : mod_cplusplus
Module  : include
Dir     : mod_cplusplus/include



Modified Files:
	cpp_request.h 


Log Message:
add some constness correctness :) patch submitted by wil...@th...
===================================================================
RCS file: /cvsroot/modcplusplus/mod_cplusplus/include/cpp_request.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- cpp_request.h	28 Jun 2004 02:54:44 -0000	1.9
+++ cpp_request.h	31 Jul 2004 13:58:07 -0000	1.10
@@ -18,8 +18,10 @@
 #include <http_core.h>
 #include <http_protocol.h>
 #include <apr_strings.h>
+#include <string>   // for std::string
 #include "cpp_server.h"
 
+using std::string;
 class MODCPP_API ApacheRequestRec
 {
 private:
@@ -41,39 +43,39 @@
     ApacheRequestRec *next() { return mNext; }
     ApacheRequestRec *prev() { return mPrev; }
     ApacheRequestRec *main() { return mMain; }
-    char *the_request() { return mRequest->the_request; }
-    int assbackwards() { return mRequest->assbackwards; }
-    int proxyreq() { return mRequest->proxyreq; }
-    int header_only() { return mRequest->header_only; }
-    char *protocol() {return mRequest->protocol; }
-    int proto_num() { return mRequest->proto_num; }
-    const char *hostname() { return mRequest->hostname; }
-    apr_time_t request_time() { return mRequest->request_time; }
-    const char *status_line() { return mRequest->status_line; }
-    int status() {return mRequest->status; }
-    const char *method() { return mRequest->method; }
-    int method_number() { return mRequest->method_number; }
-    apr_int64_t allowed() { return mRequest->allowed; }
-    apr_array_header_t *allowed_xmethods() {return mRequest->allowed_xmethods; }
-    ap_method_list_t *allowed_methods() {return mRequest->allowed_methods; }
-    apr_off_t sent_bodyct() {return mRequest->sent_bodyct; }
-    apr_off_t bytes_sent() { return mRequest->bytes_sent; }
-    apr_time_t mtime() { return mRequest->mtime; } 
-    int chunked() { return mRequest->chunked; }
-    const char *range() {return mRequest->range; }
-    apr_off_t clength() {return mRequest->clength; }
-    apr_off_t remaining() {return mRequest->remaining; }
-    apr_off_t read_length() { return mRequest->read_length; }
-    int read_body() { return mRequest->read_body; }
-    int read_chunked() { return mRequest->read_chunked; }
-    
-    apr_table_t *headers_in() { return mRequest->headers_in; }
-    apr_table_t *headers_out() { return mRequest->headers_out; }
-    apr_table_t *err_headers_out() { return mRequest->err_headers_out; }
-    apr_table_t *subprocess_env() { return mRequest->subprocess_env; }
-    apr_table_t *notes() { return mRequest->notes; }
+    char *the_request() const { return mRequest->the_request; }
+    int assbackwards() const { return mRequest->assbackwards; }
+    int proxyreq() const { return mRequest->proxyreq; }
+    int header_only() const { return mRequest->header_only; }
+    char *protocol() const {return mRequest->protocol; }
+    int proto_num() const { return mRequest->proto_num; }
+    const char *hostname() const { return mRequest->hostname; }
+    apr_time_t request_time() const { return mRequest->request_time; }
+    const char *status_line() const { return mRequest->status_line; }
+    int status() const {return mRequest->status; }
+    const char *method() const { return mRequest->method; }
+    int method_number() const { return mRequest->method_number; }
+    apr_int64_t allowed() const { return mRequest->allowed; }
+    apr_array_header_t *allowed_xmethods() const {return mRequest->allowed_xmethods; }
+    ap_method_list_t *allowed_methods() const {return mRequest->allowed_methods; }
+    apr_off_t sent_bodyct() const {return mRequest->sent_bodyct; }
+    apr_off_t bytes_sent() const { return mRequest->bytes_sent; }
+    apr_time_t mtime() const { return mRequest->mtime; } 
+    int chunked() const { return mRequest->chunked; }
+    const char *range() const {return mRequest->range; }
+    apr_off_t clength() const {return mRequest->clength; }
+    apr_off_t remaining() const {return mRequest->remaining; }
+    apr_off_t read_length() const { return mRequest->read_length; }
+    int read_body() const { return mRequest->read_body; }
+    int read_chunked() const { return mRequest->read_chunked; }
+    
+    apr_table_t *headers_in() const { return mRequest->headers_in; }
+    apr_table_t *headers_out() const { return mRequest->headers_out; }
+    apr_table_t *err_headers_out()  const { return mRequest->err_headers_out; }
+    apr_table_t *subprocess_env() const { return mRequest->subprocess_env; }
+    apr_table_t *notes() const { return mRequest->notes; }
     
-    const char *content_type(char *type = NULL) 
+    const char *content_type(char *type = NULL) const 
     { return type ? (mRequest->content_type = 
                      apr_pstrdup(mRequest->pool, type)) : 
         mRequest->content_type; }
@@ -90,27 +92,27 @@
     apr_array_header_t *content_languages() 
     { return mRequest->content_languages; }
     
-    char *vlist_validator() { return mRequest->vlist_validator; }
-    char *user() { return mRequest->user; }
-    char *ap_auth_type() { return mRequest->ap_auth_type; }
-    char *unparsed_uri() { return mRequest->unparsed_uri; }
-    char *uri() { return mRequest->uri; }
-    char *filename() { return mRequest->filename; }
-    char *path_info() { return mRequest->path_info; }
-    char *args() { return mRequest->args; }
+    char *vlist_validator() const { return mRequest->vlist_validator; }
+    char *user() const { return mRequest->user; }
+    char *ap_auth_type() const { return mRequest->ap_auth_type; }
+    char *unparsed_uri() const { return mRequest->unparsed_uri; }
+    char *uri() const { return mRequest->uri; }
+    char *filename() const { return mRequest->filename; }
+    char *path_info() const { return mRequest->path_info; }
+    char *args() const { return mRequest->args; }
     
-    int no_cache() { return mRequest->no_cache; }
-    int no_local_copy() { return mRequest->no_local_copy; }
+    int no_cache() const { return mRequest->no_cache; }
+    int no_local_copy() const { return mRequest->no_local_copy; }
     
-    apr_finfo_t finfo() { return mRequest->finfo; }
-    apr_uri_t parsed_uri() { return mRequest->parsed_uri; }
+    apr_finfo_t finfo() const { return mRequest->finfo; }
+    apr_uri_t parsed_uri() const { return mRequest->parsed_uri; }
     
     void *get_dir_config(module *m);
     void *get_server_config(module *m);
     
     int get_basic_auth_pw(const char **sent_pw);
     int rputc(int c);
-    int rputs(const char *str);
+    int rputs(const char *str) const;
     int rwrite(const void *buf, int nbyte);
     int rprintf(const char *fmt, ...);
     int rflush();
@@ -141,8 +143,10 @@
     
     void allow_methods(int reset, ...);
     
-    void dump();
-    void dump_table(apr_table_t *pTable);
+    void dump() const;
+    string dump_string() const;
+    string table_string(const apr_table_t *pTable) const;
+    void dump_table(const apr_table_t *pTable) const;
     request_rec *get_request_rec() { return mRequest; }
 };