trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bc...@apache.org
Subject svn commit: r938607 [2/5] - in /incubator/trafficserver/traffic/trunk: ./ iocore/cache/ iocore/cluster/ iocore/dns/ iocore/eventsystem/ iocore/hostdb/ iocore/net/ libinktomi++/ librecords/ proxy/ proxy/api/include/ proxy/congest/ proxy/hdrs/ proxy/http...
Date Tue, 27 Apr 2010 19:12:27 GMT
Modified: incubator/trafficserver/traffic/trunk/librecords/P_RecCore.i
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/P_RecCore.i?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/P_RecCore.i (original)
+++ incubator/trafficserver/traffic/trunk/librecords/P_RecCore.i Tue Apr 27 19:12:22 2010
@@ -331,31 +331,31 @@ recv_message_cb(RecMessage * msg, RecMes
   }
 
 int
-RecRegisterStatInt(RecT rec_type, char *name, RecInt data_default, RecPersistT persist_type)
+RecRegisterStatInt(RecT rec_type, const char *name, RecInt data_default, RecPersistT persist_type)
 {
   REC_REGISTER_STAT_XXX(rec_int, RECD_INT);
 }
 
 int
-RecRegisterStatLLong(RecT rec_type, char *name, RecLLong data_default, RecPersistT persist_type)
+RecRegisterStatLLong(RecT rec_type, const char *name, RecLLong data_default, RecPersistT persist_type)
 {
   REC_REGISTER_STAT_XXX(rec_llong, RECD_LLONG);
 }
 
 int
-RecRegisterStatFloat(RecT rec_type, char *name, RecFloat data_default, RecPersistT persist_type)
+RecRegisterStatFloat(RecT rec_type, const char *name, RecFloat data_default, RecPersistT persist_type)
 {
   REC_REGISTER_STAT_XXX(rec_float, RECD_FLOAT);
 }
 
 int
-RecRegisterStatString(RecT rec_type, char *name, RecString data_default, RecPersistT persist_type)
+RecRegisterStatString(RecT rec_type, const char *name, RecString data_default, RecPersistT persist_type)
 {
   REC_REGISTER_STAT_XXX(rec_string, RECD_STRING);
 }
 
 int
-RecRegisterStatCounter(RecT rec_type, char *name, RecCounter data_default, RecPersistT persist_type)
+RecRegisterStatCounter(RecT rec_type, const char *name, RecCounter data_default, RecPersistT persist_type)
 {
   REC_REGISTER_STAT_XXX(rec_counter, RECD_COUNTER);
 }
@@ -382,27 +382,27 @@ RecRegisterStatCounter(RecT rec_type, ch
   }
 
 int
-RecRegisterConfigInt(RecT rec_type, char *name,
+RecRegisterConfigInt(RecT rec_type, const char *name,
                      RecInt data_default, RecUpdateT update_type,
-                     RecCheckT check_type, char *check_regex, RecAccessT access_type)
+                     RecCheckT check_type, const char *check_regex, RecAccessT access_type)
 {
   ink_debug_assert((rec_type == RECT_CONFIG) || (rec_type == RECT_LOCAL));
   REC_REGISTER_CONFIG_XXX(rec_int, RECD_INT);
 }
 
 int
-RecRegisterConfigLLong(RecT rec_type, char *name,
+RecRegisterConfigLLong(RecT rec_type, const char *name,
                        RecLLong data_default, RecUpdateT update_type,
-                       RecCheckT check_type, char *check_regex, RecAccessT access_type)
+                       RecCheckT check_type, const char *check_regex, RecAccessT access_type)
 {
   ink_debug_assert((rec_type == RECT_CONFIG) || (rec_type == RECT_LOCAL));
   REC_REGISTER_CONFIG_XXX(rec_llong, RECD_LLONG);
 }
 
 int
-RecRegisterConfigFloat(RecT rec_type, char *name,
+RecRegisterConfigFloat(RecT rec_type, const char *name,
                        RecFloat data_default, RecUpdateT update_type,
-                       RecCheckT check_type, char *check_regex, RecAccessT access_type)
+                       RecCheckT check_type, const char *check_regex, RecAccessT access_type)
 {
   ink_debug_assert((rec_type == RECT_CONFIG) || (rec_type == RECT_LOCAL));
   REC_REGISTER_CONFIG_XXX(rec_float, RECD_FLOAT);
@@ -410,18 +410,19 @@ RecRegisterConfigFloat(RecT rec_type, ch
 
 
 int
-RecRegisterConfigString(RecT rec_type, char *name,
-                        RecString data_default, RecUpdateT update_type,
-                        RecCheckT check_type, char *check_regex, RecAccessT access_type)
+RecRegisterConfigString(RecT rec_type, const char *name,
+                        const char *data_default_tmp, RecUpdateT update_type,
+                        RecCheckT check_type, const char *check_regex, RecAccessT access_type)
 {
+  RecString data_default = (RecString)data_default_tmp;
   ink_debug_assert((rec_type == RECT_CONFIG) || (rec_type == RECT_LOCAL));
   REC_REGISTER_CONFIG_XXX(rec_string, RECD_STRING);
 }
 
 int
-RecRegisterConfigCounter(RecT rec_type, char *name,
+RecRegisterConfigCounter(RecT rec_type, const char *name,
                          RecCounter data_default, RecUpdateT update_type,
-                         RecCheckT check_type, char *check_regex, RecAccessT access_type)
+                         RecCheckT check_type, const char *check_regex, RecAccessT access_type)
 {
   ink_debug_assert((rec_type == RECT_CONFIG) || (rec_type == RECT_LOCAL));
   REC_REGISTER_CONFIG_XXX(rec_counter, RECD_COUNTER);
@@ -432,7 +433,7 @@ RecRegisterConfigCounter(RecT rec_type, 
 //-------------------------------------------------------------------------
 
 int
-RecSetRecord(RecT rec_type, char *name, RecDataT data_type, RecData * data, RecRawStat * data_raw, bool lock)
+RecSetRecord(RecT rec_type, const char *name, RecDataT data_type, RecData *data, RecRawStat *data_raw, bool lock)
 {
 
   int err = REC_ERR_OKAY;
@@ -548,7 +549,7 @@ Ldone:
 }
 
 int
-RecSetRecordConvert(char *name, RecString rec_string, bool lock)
+RecSetRecordConvert(const char *name, const RecString rec_string, bool lock)
 {
   RecData data;
   data.rec_string = rec_string;
@@ -556,7 +557,7 @@ RecSetRecordConvert(char *name, RecStrin
 }
 
 int
-RecSetRecordInt(char *name, RecInt rec_int, bool lock)
+RecSetRecordInt(const char *name, RecInt rec_int, bool lock)
 {
   RecData data;
   data.rec_int = rec_int;
@@ -564,7 +565,7 @@ RecSetRecordInt(char *name, RecInt rec_i
 }
 
 int
-RecSetRecordLLong(char *name, RecLLong rec_llong, bool lock)
+RecSetRecordLLong(const char *name, RecLLong rec_llong, bool lock)
 {
   RecData data;
   data.rec_llong = rec_llong;
@@ -572,7 +573,7 @@ RecSetRecordLLong(char *name, RecLLong r
 }
 
 int
-RecSetRecordFloat(char *name, RecFloat rec_float, bool lock)
+RecSetRecordFloat(const char *name, RecFloat rec_float, bool lock)
 {
   RecData data;
   data.rec_float = rec_float;
@@ -580,7 +581,7 @@ RecSetRecordFloat(char *name, RecFloat r
 }
 
 int
-RecSetRecordString(char *name, RecString rec_string, bool lock)
+RecSetRecordString(const char *name, const RecString rec_string, bool lock)
 {
   RecData data;
   data.rec_string = rec_string;
@@ -588,7 +589,7 @@ RecSetRecordString(char *name, RecString
 }
 
 int
-RecSetRecordCounter(char *name, RecCounter rec_counter, bool lock)
+RecSetRecordCounter(const char *name, RecCounter rec_counter, bool lock)
 {
   RecData data;
   data.rec_counter = rec_counter;

Modified: incubator/trafficserver/traffic/trunk/librecords/P_RecDefs.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/P_RecDefs.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/P_RecDefs.h (original)
+++ incubator/trafficserver/traffic/trunk/librecords/P_RecDefs.h Tue Apr 27 19:12:22 2010
@@ -112,7 +112,7 @@ struct RecConfigMeta
 struct RecRecord
 {
   RecT rec_type;
-  char *name;
+  const char *name;
   RecDataT data_type;
   RecData data;
   RecData data_default;

Modified: incubator/trafficserver/traffic/trunk/librecords/P_RecMessage.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/P_RecMessage.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/P_RecMessage.h (original)
+++ incubator/trafficserver/traffic/trunk/librecords/P_RecMessage.h Tue Apr 27 19:12:22 2010
@@ -47,7 +47,7 @@ int RecMessageSend(RecMessage * msg);
 int RecMessageRegisterRecvCb(RecMessageRecvCb recv_cb, void *cookie);
 void *RecMessageRecvThis(void *cookie, char *data_raw, int data_len);
 
-RecMessage *RecMessageReadFromDisk(char *fpath);
-int RecMessageWriteToDisk(RecMessage * msg, char *fpath);
+RecMessage *RecMessageReadFromDisk(const char *fpath);
+int RecMessageWriteToDisk(RecMessage *msg, const char *fpath);
 
 #endif

Modified: incubator/trafficserver/traffic/trunk/librecords/P_RecProcess.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/P_RecProcess.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/P_RecProcess.h (original)
+++ incubator/trafficserver/traffic/trunk/librecords/P_RecProcess.h Tue Apr 27 19:12:22 2010
@@ -37,7 +37,7 @@
 // Protected Interface
 //-------------------------------------------------------------------------
 
-int RecRegisterRawStatSyncCb(char *name, RecRawStatSyncCb sync_cb, RecRawStatBlock * rsb, int id);
+int RecRegisterRawStatSyncCb(const char *name, RecRawStatSyncCb sync_cb, RecRawStatBlock * rsb, int id);
 
 int RecExecRawStatSyncCbs();
 

Modified: incubator/trafficserver/traffic/trunk/librecords/P_RecTree.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/P_RecTree.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/P_RecTree.h (original)
+++ incubator/trafficserver/traffic/trunk/librecords/P_RecTree.h Tue Apr 27 19:12:22 2010
@@ -38,13 +38,13 @@ class RecTree;
 class RecTreeNode
 {
 public:
-  RecTreeNode(char *name = NULL);
+  RecTreeNode(const char *name = NULL);
    ~RecTreeNode();
 
   RecRecord *record_ptr;
   RecTree *subtree_ptr;
   char *node_name;
-  char *var_name_ptr;
+  const char *var_name_ptr;
   int num_leaf;
   LINK(RecTreeNode, link);
 
@@ -78,7 +78,7 @@ public:
     return (current->link).next;
   };
 
-  void rec_tree_insert(char *, char *full_name = NULL);
+  void rec_tree_insert(const char *, const char *full_name = NULL);
   RecTree *rec_tree_get(char *);
   void rec_tree_get_list(char *, char ***, int *);
 

Modified: incubator/trafficserver/traffic/trunk/librecords/P_RecUtils.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/P_RecUtils.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/P_RecUtils.h (original)
+++ incubator/trafficserver/traffic/trunk/librecords/P_RecUtils.h Tue Apr 27 19:12:22 2010
@@ -50,7 +50,7 @@
 // RecData Utils
 //-------------------------------------------------------------------------
 
-RecRecord *RecAlloc(RecT rec_type, char *name, RecDataT data_type);
+RecRecord *RecAlloc(RecT rec_type, const char *name, RecDataT data_type);
 void RecDataClear(RecDataT data_type, RecData * data);
 bool RecDataSet(RecDataT data_type, RecData * data_dst, RecData * data_src);
 bool RecDataSetFromInk64(RecDataT data_type, RecData * data_dst, ink64 data_ink64);

Modified: incubator/trafficserver/traffic/trunk/librecords/RecCore.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/RecCore.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/RecCore.cc (original)
+++ incubator/trafficserver/traffic/trunk/librecords/RecCore.cc Tue Apr 27 19:12:22 2010
@@ -37,12 +37,12 @@ InkHashTable *g_records_ht = NULL;
 ink_rwlock g_records_rwlock;
 int g_num_records = 0;
 
-char *g_rec_config_fpath = NULL;
+const char *g_rec_config_fpath = NULL;
 LLQ *g_rec_config_contents_llq = NULL;
 InkHashTable *g_rec_config_contents_ht = NULL;
 ink_mutex g_rec_config_lock;
 
-char *g_stats_snap_fpath = NULL;
+const char *g_stats_snap_fpath = NULL;
 int g_num_update[RECT_MAX];
 
 RecTree *g_records_tree = NULL;
@@ -55,7 +55,7 @@ int g_type_num_records[RECT_MAX];
 //-------------------------------------------------------------------------
 
 static RecRecord *
-register_record(RecT rec_type, char *name, RecDataT data_type, RecData data_default, bool release_record_lock)
+register_record(RecT rec_type, const char *name, RecDataT data_type, RecData data_default, bool release_record_lock)
 {
 
   RecRecord *r = NULL;
@@ -185,7 +185,7 @@ link_string_alloc(const char *name, RecD
 //-------------------------------------------------------------------------
 
 int
-RecCoreInit(RecModeT mode_type, Diags * _diags)
+RecCoreInit(RecModeT mode_type, Diags *_diags)
 {
 
   if (g_initialized) {
@@ -274,7 +274,7 @@ RecSetDiags(Diags * _diags)
 //-------------------------------------------------------------------------
 
 int
-RecLinkConfigInt(char *name, RecInt * rec_int)
+RecLinkConfigInt(const char *name, RecInt * rec_int)
 {
   if (RecGetRecordInt(name, rec_int) == REC_ERR_FAIL) {
     return REC_ERR_FAIL;
@@ -283,7 +283,7 @@ RecLinkConfigInt(char *name, RecInt * re
 }
 
 int
-RecLinkConfigLLong(char *name, RecLLong * rec_llong)
+RecLinkConfigLLong(const char *name, RecLLong * rec_llong)
 {
   if (RecGetRecordLLong(name, rec_llong) == REC_ERR_FAIL) {
     return REC_ERR_FAIL;
@@ -292,19 +292,19 @@ RecLinkConfigLLong(char *name, RecLLong 
 }
 
 int
-RecLinkConfigInk32(char *name, ink32 * p_ink32)
+RecLinkConfigInk32(const char *name, ink32 * p_ink32)
 {
   return RecRegisterConfigUpdateCb(name, link_ink32, (void *) p_ink32);
 }
 
 int
-RecLinkConfigInkU32(char *name, inku32 * p_inku32)
+RecLinkConfigInkU32(const char *name, inku32 * p_inku32)
 {
   return RecRegisterConfigUpdateCb(name, link_inku32, (void *) p_inku32);
 }
 
 int
-RecLinkConfigFloat(char *name, RecFloat * rec_float)
+RecLinkConfigFloat(const char *name, RecFloat * rec_float)
 {
   if (RecGetRecordFloat(name, rec_float) == REC_ERR_FAIL) {
     return REC_ERR_FAIL;
@@ -313,7 +313,7 @@ RecLinkConfigFloat(char *name, RecFloat 
 }
 
 int
-RecLinkConfigCounter(char *name, RecCounter * rec_counter)
+RecLinkConfigCounter(const char *name, RecCounter * rec_counter)
 {
   if (RecGetRecordCounter(name, rec_counter) == REC_ERR_FAIL) {
     return REC_ERR_FAIL;
@@ -322,7 +322,7 @@ RecLinkConfigCounter(char *name, RecCoun
 }
 
 int
-RecLinkConfigString(char *name, RecString * rec_string)
+RecLinkConfigString(const char *name, RecString * rec_string)
 {
   if (RecGetRecordString_Xmalloc(name, rec_string) == REC_ERR_FAIL) {
     return REC_ERR_FAIL;
@@ -335,7 +335,7 @@ RecLinkConfigString(char *name, RecStrin
 //-------------------------------------------------------------------------
 
 int
-RecRegisterConfigUpdateCb(char *name, RecConfigUpdateCb update_cb, void *cookie)
+RecRegisterConfigUpdateCb(const char *name, RecConfigUpdateCb update_cb, void *cookie)
 {
 
   int err = REC_ERR_FAIL;
@@ -398,7 +398,7 @@ RecRegisterStatUpdateFunc(char *name, Re
 }
 
 int
-RecRegisterRawStatUpdateFunc(char *name, RecRawStatBlock * rsb, int id, RecStatUpdateFunc update_func, void *cookie)
+RecRegisterRawStatUpdateFunc(const char *name, RecRawStatBlock * rsb, int id, RecStatUpdateFunc update_func, void *cookie)
 {
 
   int err = REC_ERR_FAIL;
@@ -447,7 +447,7 @@ RecRegisterRawStatUpdateFunc(char *name,
 //-------------------------------------------------------------------------
 
 int
-RecGetRecordInt(char *name, RecInt * rec_int, bool lock)
+RecGetRecordInt(const char *name, RecInt *rec_int, bool lock)
 {
   int err;
   RecData data;
@@ -457,7 +457,7 @@ RecGetRecordInt(char *name, RecInt * rec
 }
 
 int
-RecGetRecordLLong(char *name, RecLLong * rec_llong, bool lock)
+RecGetRecordLLong(const char *name, RecLLong * rec_llong, bool lock)
 {
   int err;
   RecData data;
@@ -467,7 +467,7 @@ RecGetRecordLLong(char *name, RecLLong *
 }
 
 int
-RecGetRecordFloat(char *name, RecFloat * rec_float, bool lock)
+RecGetRecordFloat(const char *name, RecFloat * rec_float, bool lock)
 {
   int err;
   RecData data;
@@ -477,7 +477,7 @@ RecGetRecordFloat(char *name, RecFloat *
 }
 
 int
-RecGetRecordString(char *name, char *buf, int buf_len, bool lock)
+RecGetRecordString(const char *name, char *buf, int buf_len, bool lock)
 {
   int err = REC_ERR_OKAY;
   RecRecord *r;
@@ -507,7 +507,7 @@ RecGetRecordString(char *name, char *buf
 }
 
 int
-RecGetRecordString_Xmalloc(char *name, RecString * rec_string, bool lock)
+RecGetRecordString_Xmalloc(const char *name, RecString * rec_string, bool lock)
 {
   int err;
   RecData data;
@@ -517,7 +517,7 @@ RecGetRecordString_Xmalloc(char *name, R
 }
 
 int
-RecGetRecordCounter(char *name, RecCounter * rec_counter, bool lock)
+RecGetRecordCounter(const char *name, RecCounter * rec_counter, bool lock)
 {
   int err;
   RecData data;
@@ -527,7 +527,7 @@ RecGetRecordCounter(char *name, RecCount
 }
 
 int
-RecGetRecordGeneric_Xmalloc(char *name, RecString * rec_string, bool lock)
+RecGetRecordGeneric_Xmalloc(const char *name, RecString * rec_string, bool lock)
 {
   int err;
 
@@ -574,7 +574,7 @@ RecGetRecordGeneric_Xmalloc(char *name, 
 //-------------------------------------------------------------------------
 
 int
-RecGetRecordType(char *name, RecT * rec_type, bool lock)
+RecGetRecordType(const char *name, RecT * rec_type, bool lock)
 {
   int err = REC_ERR_FAIL;
   RecRecord *r;
@@ -599,7 +599,7 @@ RecGetRecordType(char *name, RecT * rec_
 
 
 int
-RecGetRecordDataType(char *name, RecDataT * data_type, bool lock)
+RecGetRecordDataType(const char *name, RecDataT * data_type, bool lock)
 {
   int err = REC_ERR_FAIL;
   RecRecord *r = NULL;
@@ -633,7 +633,7 @@ RecGetRecordUpdateCount(RecT data_type)
 }
 
 int
-RecGetRecordRelativeOrder(char *name, int *order, bool lock)
+RecGetRecordRelativeOrder(const char *name, int *order, bool lock)
 {
   int err = REC_ERR_FAIL;
   RecRecord *r = NULL;
@@ -657,7 +657,7 @@ RecGetRecordRelativeOrder(char *name, in
 }
 
 int
-RecGetRecordUpdateType(char *name, RecUpdateT * update_type, bool lock)
+RecGetRecordUpdateType(const char *name, RecUpdateT *update_type, bool lock)
 {
   int err = REC_ERR_FAIL;
   RecRecord *r = NULL;
@@ -686,7 +686,7 @@ RecGetRecordUpdateType(char *name, RecUp
 
 
 int
-RecGetRecordCheckType(char *name, RecCheckT * check_type, bool lock)
+RecGetRecordCheckType(const char *name, RecCheckT *check_type, bool lock)
 {
   int err = REC_ERR_FAIL;
   RecRecord *r = NULL;
@@ -715,7 +715,7 @@ RecGetRecordCheckType(char *name, RecChe
 
 
 int
-RecGetRecordCheckExpr(char *name, char **check_expr, bool lock)
+RecGetRecordCheckExpr(const char *name, char **check_expr, bool lock)
 {
   int err = REC_ERR_FAIL;
   RecRecord *r = NULL;
@@ -795,7 +795,7 @@ RecGetRecordDefaultDataString_Xmalloc(ch
 
 
 int
-RecGetRecordAccessType(char *name, RecAccessT * access, bool lock)
+RecGetRecordAccessType(const char *name, RecAccessT *access, bool lock)
 {
   int err = REC_ERR_FAIL;
   RecRecord *r = NULL;
@@ -820,7 +820,7 @@ RecGetRecordAccessType(char *name, RecAc
 
 
 int
-RecSetRecordAccessType(char *name, RecAccessT access, bool lock)
+RecSetRecordAccessType(const char *name, RecAccessT access, bool lock)
 {
   int err = REC_ERR_FAIL;
   RecRecord *r = NULL;
@@ -850,7 +850,7 @@ RecSetRecordAccessType(char *name, RecAc
 //-------------------------------------------------------------------------
 
 RecRecord *
-RecRegisterStat(RecT rec_type, char *name, RecDataT data_type, RecData data_default, RecPersistT persist_type)
+RecRegisterStat(RecT rec_type, const char *name, RecDataT data_type, RecData data_default, RecPersistT persist_type)
 {
 
   RecRecord *r = NULL;
@@ -872,9 +872,9 @@ RecRegisterStat(RecT rec_type, char *nam
 //-------------------------------------------------------------------------
 
 RecRecord *
-RecRegisterConfig(RecT rec_type, char *name, RecDataT data_type,
+RecRegisterConfig(RecT rec_type, const char *name, RecDataT data_type,
                   RecData data_default, RecUpdateT update_type,
-                  RecCheckT check_type, char *check_expr, RecAccessT access_type)
+                  RecCheckT check_type, const char *check_expr, RecAccessT access_type)
 {
 
   RecRecord *r;
@@ -902,7 +902,7 @@ RecRegisterConfig(RecT rec_type, char *n
 //-------------------------------------------------------------------------
 
 int
-RecGetRecord_Xmalloc(char *name, RecDataT data_type, RecData * data, bool lock)
+RecGetRecord_Xmalloc(const char *name, RecDataT data_type, RecData *data, bool lock)
 {
 
   int err = REC_ERR_OKAY;
@@ -1117,7 +1117,7 @@ RecGetRecordPrefix_Xmalloc(char *prefix,
 //-------------------------------------------------------------------------
 
 RecInt
-REC_ConfigReadInteger(char *name)
+REC_ConfigReadInteger(const char *name)
 {
   RecInt t = 0;
   RecGetRecordInt(name, &t);
@@ -1129,7 +1129,7 @@ REC_ConfigReadInteger(char *name)
 //-------------------------------------------------------------------------
 
 RecLLong
-REC_ConfigReadLLong(char *name)
+REC_ConfigReadLLong(const char *name)
 {
   RecLLong t = 0;
   RecGetRecordLLong(name, &t);
@@ -1141,7 +1141,7 @@ REC_ConfigReadLLong(char *name)
 //-------------------------------------------------------------------------
 
 char *
-REC_ConfigReadString(char *name)
+REC_ConfigReadString(const char *name)
 {
   char *t = 0;
   RecGetRecordString_Xmalloc(name, (RecString *) & t);
@@ -1153,7 +1153,7 @@ REC_ConfigReadString(char *name)
 //-------------------------------------------------------------------------
 
 RecFloat
-REC_ConfigReadFloat(char *name)
+REC_ConfigReadFloat(const char *name)
 {
   RecFloat t = 0;
   RecGetRecordFloat(name, (RecFloat *) & t);
@@ -1165,7 +1165,7 @@ REC_ConfigReadFloat(char *name)
 //-------------------------------------------------------------------------
 
 RecCounter
-REC_ConfigReadCounter(char *name)
+REC_ConfigReadCounter(const char *name)
 {
   RecCounter t = 0;
   RecGetRecordCounter(name, (RecCounter *) & t);
@@ -1178,7 +1178,7 @@ REC_ConfigReadCounter(char *name)
 //-------------------------------------------------------------------------
 
 RecInt
-REC_readInteger(char *name, bool * found, bool lock)
+REC_readInteger(const char *name, bool * found, bool lock)
 {
   ink_debug_assert(name);
   RecInt _tmp = 0;
@@ -1226,7 +1226,7 @@ REC_readCounter(char *name, bool * found
 }
 
 RecString
-REC_readString(char *name, bool * found, bool lock)
+REC_readString(const char *name, bool * found, bool lock)
 {
   ink_debug_assert(name);
   RecString _tmp = NULL;
@@ -1240,35 +1240,35 @@ REC_readString(char *name, bool * found,
 // MGMT2 Marco's -- converting lmgmt->record_data->setXXX
 
 bool
-REC_setInteger(char *name, int value, bool dirty)
+REC_setInteger(const char *name, int value, bool dirty)
 {
   REC_NOWARN_UNUSED(dirty);
   return RecSetRecordInt(name, value);
 }
 
 bool
-REC_setLLong(char *name, RecLLong value, bool dirty)
+REC_setLLong(const char *name, RecLLong value, bool dirty)
 {
   REC_NOWARN_UNUSED(dirty);
   return RecSetRecordLLong(name, value);
 }
 
 bool
-REC_setFloat(char *name, float value, bool dirty)
+REC_setFloat(const char *name, float value, bool dirty)
 {
   REC_NOWARN_UNUSED(dirty);
   return RecSetRecordFloat(name, value);
 }
 
 bool
-REC_setCounter(char *name, ink64 value, bool dirty)
+REC_setCounter(const char *name, ink64 value, bool dirty)
 {
   REC_NOWARN_UNUSED(dirty);
   return RecSetRecordCounter(name, value);
 }
 
 bool
-REC_setString(char *name, char *value, bool dirty)
+REC_setString(const char *name, char *value, bool dirty)
 {
   REC_NOWARN_UNUSED(dirty);
   return RecSetRecordString(name, value);
@@ -1299,7 +1299,7 @@ RecSignalAlarm(int id, char *msg)
 }
 
 void
-RecSignalManager(int id, char *msg)
+RecSignalManager(int id, const char *msg)
 {
   REC_NOWARN_UNUSED(id);
   REC_NOWARN_UNUSED(msg);
@@ -1330,7 +1330,7 @@ RecSignalAlarm(int id, char *msg)
 }
 
 void
-RecSignalManager(int id, char *msg)
+RecSignalManager(int id, const char *msg)
 {
   ink_debug_assert(pmgmt);
   pmgmt->signalManager(id, msg);
@@ -1359,7 +1359,7 @@ RecSignalAlarm(int id, char *msg)
 }
 
 void
-RecSignalManager(int id, char *msg)
+RecSignalManager(int id, const char *msg)
 {
   REC_NOWARN_UNUSED(id);
   RecLog(DL_Warning, msg);

Modified: incubator/trafficserver/traffic/trunk/librecords/RecMessage.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/RecMessage.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/RecMessage.cc (original)
+++ incubator/trafficserver/traffic/trunk/librecords/RecMessage.cc Tue Apr 27 19:12:22 2010
@@ -499,7 +499,7 @@ RecMessageRecvThis(void *cookie, char *d
 //-------------------------------------------------------------------------
 
 RecMessage *
-RecMessageReadFromDisk(char *fpath)
+RecMessageReadFromDisk(const char *fpath)
 {
 
   RecMessageHdr msg_hdr;
@@ -542,7 +542,7 @@ Ldone:
 //-------------------------------------------------------------------------
 
 int
-RecMessageWriteToDisk(RecMessage * msg, char *fpath)
+RecMessageWriteToDisk(RecMessage *msg, const char *fpath)
 {
 
   int msg_size;

Modified: incubator/trafficserver/traffic/trunk/librecords/RecProcess.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/RecProcess.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/RecProcess.cc (original)
+++ incubator/trafficserver/traffic/trunk/librecords/RecProcess.cc Tue Apr 27 19:12:22 2010
@@ -427,9 +427,7 @@ RecAllocateRawStatBlock(int num_stats)
 //-------------------------------------------------------------------------
 
 int
-RecRegisterRawStat(RecRawStatBlock * rsb,
-                   RecT rec_type,
-                   char *name, RecDataT data_type, RecPersistT persist_type, int id, RecRawStatSyncCb sync_cb)
+RecRegisterRawStat(RecRawStatBlock * rsb, RecT rec_type, const char *name, RecDataT data_type, RecPersistT persist_type, int id, RecRawStatSyncCb sync_cb)
 {
 
   Debug("stats", "RecRawStatSyncCb(): rsb pointer:%p id:%d\n", rsb, id);
@@ -722,7 +720,7 @@ RecGetGlobalRawStatCountPtr(RecRawStatBl
 //-------------------------------------------------------------------------
 
 int
-RecRegisterRawStatSyncCb(char *name, RecRawStatSyncCb sync_cb, RecRawStatBlock * rsb, int id)
+RecRegisterRawStatSyncCb(const char *name, RecRawStatSyncCb sync_cb, RecRawStatBlock * rsb, int id)
 {
   int err = REC_ERR_FAIL;
   RecRecord *r;

Modified: incubator/trafficserver/traffic/trunk/librecords/RecTree.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/RecTree.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/RecTree.cc (original)
+++ incubator/trafficserver/traffic/trunk/librecords/RecTree.cc Tue Apr 27 19:12:22 2010
@@ -33,7 +33,7 @@ bool rec_debug = false;
  * RecTreeNode
  *
  *************************************************************************/
-RecTreeNode::RecTreeNode(char *t):
+RecTreeNode::RecTreeNode(const char *t):
 record_ptr(NULL),
 subtree_ptr(new RecTree(this)),
 var_name_ptr(NULL),
@@ -42,7 +42,7 @@ num_leaf(0)
   if (t) {
     node_name = xstrdup(t);
   } else {
-    node_name = "root";
+    node_name = xstrdup("root");
   }
 }
 
@@ -90,7 +90,7 @@ RecTree::RecTree(RecTreeNode * n)
  *									  
  *************************************************************************/
 void
-RecTree::rec_tree_insert(char *var_name, char *var_name_ptr)
+RecTree::rec_tree_insert(const char *var_name, const char *var_name_ptr)
 {
   if ((var_name == NULL) || (!strlen(var_name))) {
     return;
@@ -105,7 +105,7 @@ RecTree::rec_tree_insert(char *var_name,
   tok_iter_state targetTok_state;
   const char *first_token = targetTok.iterFirst(&targetTok_state);
 
-  char *rest_token = strchr(var_name, REC_VAR_NAME_DELIMITOR);
+  const char *rest_token = strchr(var_name, REC_VAR_NAME_DELIMITOR);
   if (rest_token) {
     rest_token++;
     if (rec_debug) {
@@ -262,7 +262,7 @@ RecTree::p_rec_tree_get_list(char *path_
 {
 
   if (this_node->var_name_ptr) {
-    (*buffer)[(*index)] = this_node->var_name_ptr;
+    (*buffer)[(*index)] = (char*)this_node->var_name_ptr;
     if (rec_debug) {
       RecTreeDebug("%d %s\n", (*index), (*buffer)[(*index)]);
     }

Modified: incubator/trafficserver/traffic/trunk/librecords/RecUtils.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/librecords/RecUtils.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/librecords/RecUtils.cc (original)
+++ incubator/trafficserver/traffic/trunk/librecords/RecUtils.cc Tue Apr 27 19:12:22 2010
@@ -34,7 +34,7 @@ extern Diags *g_diags;
 //-------------------------------------------------------------------------
 
 RecRecord *
-RecAlloc(RecT rec_type, char *name, RecDataT data_type)
+RecAlloc(RecT rec_type, const char *name, RecDataT data_type)
 {
 
   if (g_num_records >= REC_MAX_RECORDS) {

Modified: incubator/trafficserver/traffic/trunk/proxy/CacheInspectorAllow.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/CacheInspectorAllow.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/CacheInspectorAllow.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/CacheInspectorAllow.cc Tue Apr 27 19:12:22 2010
@@ -182,7 +182,7 @@ CacheInspectorAllow::BuildTable()
 {
   char *tok_state = NULL;
   char *line = NULL;
-  char *errPtr = NULL;
+  const char *errPtr = NULL;
   char errBuf[1024];
   char *file_buf = NULL;
   int line_num = 0;

Modified: incubator/trafficserver/traffic/trunk/proxy/ControlMatcher.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/ControlMatcher.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/ControlMatcher.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/ControlMatcher.cc Tue Apr 27 19:12:22 2010
@@ -482,7 +482,7 @@ template<class Data, class Result> char 
 {
 
   Data *cur_d;
-  char *errPtr;
+  const char *errPtr;
   char *errBuf;
   char *match_data;
   ip_addr_t addr1, addr2;
@@ -684,7 +684,7 @@ template<class Data, class Result> int C
   int numEntries = 0;
   bool alarmAlready = false;
   char errBuf[1024];
-  char *errPtr = NULL;
+  const char *errPtr = NULL;
 
   // type counts
   int hostDomain = 0;
@@ -807,7 +807,7 @@ template<class Data, class Result> int C
     //   the NewEntry
     if (errPtr != NULL) {
       SignalError(errPtr, alarmAlready);
-      xfree(errPtr);
+      //xfree(errPtr); // XXX - why are we trying to free
       errPtr = NULL;
     }
     // Deallocate the parsing structure

Modified: incubator/trafficserver/traffic/trunk/proxy/DiagsConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/DiagsConfig.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/DiagsConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/DiagsConfig.cc Tue Apr 27 19:12:22 2010
@@ -61,7 +61,7 @@ DiagsConfig::reconfigure_diags()
 
   static struct
   {
-    char *config_name;
+    const char *config_name;
     DiagsLevel level;
   } output_records[] = {
     {
@@ -108,7 +108,7 @@ DiagsConfig::reconfigure_diags()
 
   // read output routing values
   for (i = 0;; i++) {
-    char *record_name = output_records[i].config_name;
+    const char *record_name = output_records[i].config_name;
     DiagsLevel l = output_records[i].level;
 
     if (!record_name)
@@ -391,7 +391,7 @@ void
 DiagsConfig::register_diags_callbacks()
 {
 
-  static char *config_record_names[] = {
+  static const char *config_record_names[] = {
     "proxy.config.diags.debug.enabled",
     "proxy.config.diags.debug.tags",
     "proxy.config.diags.action.enabled",

Modified: incubator/trafficserver/traffic/trunk/proxy/EventName.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/EventName.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/EventName.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/EventName.cc Tue Apr 27 19:12:22 2010
@@ -46,7 +46,7 @@
   return a string of the integer identifier.
   -------------------------------------------------------------------------*/
 
-char *
+const char *
 event_int_to_string(int event, char buffer[32])
 {
   switch (event) {

Modified: incubator/trafficserver/traffic/trunk/proxy/ICPConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/ICPConfig.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/ICPConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/ICPConfig.cc Tue Apr 27 19:12:22 2010
@@ -1372,7 +1372,7 @@ ICPlog::GetContentType()
 // ICP Debug support.
 //*****************************************************************************
 //
-static char *ICPstatNames[] = {
+static const char *ICPstatNames[] = {
   "icp_stat_def",
   "config_mgmt_callouts_stat",
   "reconfig_polls_stat",
@@ -1412,7 +1412,7 @@ static char *ICPstatNames[] = {
 };
 
 void
-dumpICPstatEntry(int i, char *name)
+dumpICPstatEntry(int i, const char *name)
 {
   int l = strlen(name);
   ink64 sval, cval;
@@ -1460,7 +1460,7 @@ ICPProcessor::DumpICPConfig()
     type = P->GetType();
     *(inku32 *) & ip = (inku32) (P->GetIP())->s_addr;
     icp_port = P->GetPort();
-    char *str_type;
+    const char *str_type;
 
     switch (type) {
     case PEER_PARENT:

Modified: incubator/trafficserver/traffic/trunk/proxy/IPAllow.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/IPAllow.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/IPAllow.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/IPAllow.cc Tue Apr 27 19:12:22 2010
@@ -178,7 +178,7 @@ IpAllow::BuildTable()
 {
   char *tok_state = NULL;
   char *line = NULL;
-  char *errPtr = NULL;
+  const char *errPtr = NULL;
   char errBuf[1024];
   char *file_buf = NULL;
   int line_num = 0;

Modified: incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/InkAPI.cc Tue Apr 27 19:12:22 2010
@@ -1830,11 +1830,11 @@ INKPluginDirGet(void)
 {
   const char *CFG_NM = "proxy.config.plugin.plugin_dir";
   static char path[PATH_NAME_MAX];
-  static char *plugin_dir = ".";
+  static const char *plugin_dir = ".";
 
   if (*path == '\0') {
 
-    RecGetRecordString_Xmalloc((char *) CFG_NM, &plugin_dir);
+    RecGetRecordString_Xmalloc((char *) CFG_NM, (char**)&plugin_dir);
     if (!plugin_dir) {
       Error("Unable to read %s", CFG_NM);
       return NULL;
@@ -7657,7 +7657,7 @@ INKMatcherTokLine(char *buffer, char **l
 char *
 INKMatcherExtractIPRange(char *match_str, INKU32 * addr1, INKU32 * addr2)
 {
-  return ExtractIpRange(match_str, (ip_addr_t *) addr1, (ip_addr_t *) addr2);
+  return (char*)ExtractIpRange(match_str, (ip_addr_t *) addr1, (ip_addr_t *) addr2);
 }
 
 INKMatcherLine
@@ -7674,7 +7674,7 @@ INKMatcherLineDestroy(INKMatcherLine ml)
   }
 }
 
-char *
+const char *
 INKMatcherParseSrcIPConfigLine(char *line, INKMatcherLine ml)
 {
   return parseConfigLine(line, (matcher_line *) ml, &ip_allow_tags);

Modified: incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/InkAPITest.cc Tue Apr 27 19:12:22 2010
@@ -52,7 +52,7 @@ extern int errno;
 
 /* Use SDK_RPRINT to report failure or success for each test case */
 int
-SDK_RPRINT(RegressionTest * t, char *api_name, char *testcase_name, int status, char *err_details_format, ...)
+SDK_RPRINT(RegressionTest * t, const char *api_name, const char *testcase_name, int status, const char *err_details_format, ...)
 {
   int l;
   char buffer[8192];
@@ -209,8 +209,8 @@ REGRESSION_TEST(SDK_API_INKPluginDirGet)
 static int my_config_id = -1;
 typedef struct
 {
-  char *a;
-  char *b;
+  const char *a;
+  const char *b;
 } ConfigData;
 
 static void
@@ -2895,22 +2895,22 @@ REGRESSION_TEST(SDK_API_INKUrl) (Regress
   INKMLoc url_loc3;
   const char *scheme = INK_URL_SCHEME_HTTP;
   const char *scheme_get;
-  char *user = "yyy";
+  const char *user = "yyy";
   const char *user_get;
-  char *password = "xxx";
+  const char *password = "xxx";
   const char *password_get;
-  char *host = "www.example.com";
+  const char *host = "www.example.com";
   const char *host_get;
   int port = 2021;
   char port_char[10];
   int port_get = 80;
-  char *path = "about/overview.html";
+  const char *path = "about/overview.html";
   const char *path_get;
-  char *params = "abcdef";
+  const char *params = "abcdef";
   const char *params_get;
-  char *query = "name=xxx";
+  const char *query = "name=xxx";
   const char *query_get;
-  char *fragment = "yyy";
+  const char *fragment = "yyy";
   const char *fragment_get;
   char *url_expected_string;
   char *url_string_from_1 = (char *) INK_ERROR_PTR;
@@ -3430,7 +3430,7 @@ REGRESSION_TEST(SDK_API_INKHttpHdr) (Reg
   int url_port = 2345;
   const char *url_path = "abcd/efg/hij.htm";
 
-  char *response_reason = "aefa";
+  const char *response_reason = "aefa";
   const char *response_reason_get;
 
   INKHttpStatus status_get;
@@ -3451,7 +3451,7 @@ REGRESSION_TEST(SDK_API_INKHttpHdr) (Reg
   /* int version2; unused: lv */
 
   int length;
-  char *expected_iobuf = "GET http://www.example.com:2345/abcd/efg/hij.htm HTTP/2.1\r\n\r\n";
+  const char *expected_iobuf = "GET http://www.example.com:2345/abcd/efg/hij.htm HTTP/2.1\r\n\r\n";
   int actual_length;
   int expected_length;
   bool test_passed_Http_Hdr_Create = false;
@@ -5389,12 +5389,12 @@ convert_http_hdr_to_string(INKMBuffer bu
 
 REGRESSION_TEST(SDK_API_INKHttpHdrParse) (RegressionTest * test, int atype, int *pstatus) {
 
-  char *req =
+  const char *req =
     "GET http://www.example.com/ HTTP/1.1\r\nmimefield1:field1value1,field1value2\r\nmimefield2:field2value1,field2value2\r\n\r\n";
-  char *resp =
+  const char *resp =
     "HTTP/1.1 200 OK\r\n1mimefield:1field1value,1field2value\r\n2mimefield:2field1value,2field2value\r\n\r\n";
   const char *start;
-  char *end;
+  const char *end;
   char *temp;
 
   int retval;
@@ -5717,10 +5717,10 @@ compare_field_values(RegressionTest * te
 
 REGRESSION_TEST(SDK_API_INKMimeHdrParse) (RegressionTest * test, int atype, int *pstatus) {
 
-  char *parse_string =
+  const char *parse_string =
     "field1:field1Value1,field1Value2\r\nfield2:10,-34,45\r\nfield3:field3Value1,23\r\nfield2: 2345, field2Value2\r\n\r\n";
-  char *DUPLICATE_FIELD_NAME = "field2";
-  char *REMOVE_FIELD_NAME = "field3";
+  const char *DUPLICATE_FIELD_NAME = "field2";
+  const char *REMOVE_FIELD_NAME = "field3";
 
   INKMimeParser parser;
 
@@ -5736,7 +5736,8 @@ REGRESSION_TEST(SDK_API_INKMimeHdrParse)
   INKMLoc field_loc2 = (INKMLoc) INK_ERROR_PTR;
 
   const char *start;
-  char *end, *temp;
+  const char *end;
+  char *temp;
 
   int retval;
   int hdrLength;
@@ -6227,9 +6228,9 @@ REGRESSION_TEST(SDK_API_INKMimeHdrParse)
 
 REGRESSION_TEST(SDK_API_INKUrlParse) (RegressionTest * test, int atype, int *pstatus) {
 
-  char *url = "http://abc:def@www.example.com:3426/homepage.cgi;ab?abc=def#abc";
+  const char *url = "http://abc:def@www.example.com:3426/homepage.cgi;ab?abc=def#abc";
   const char *start;
-  char *end;
+  const char *end;
   char *temp;
 
   int retval;
@@ -6383,7 +6384,7 @@ REGRESSION_TEST(SDK_API_INKTextLog) (Reg
     SDK_RPRINT(test, "INKTextLogObjectCreate", "TestCase1", TC_PASS, "ok");
   }
 
-  retVal = INKTextLogObjectWrite(log, LOG_TEST_PATTERN);
+  retVal = INKTextLogObjectWrite(log, (char*)LOG_TEST_PATTERN);
   if (retVal != INK_SUCCESS) {
     SDK_RPRINT(test, "INKTextLogObjectWrite", "TestCase1", TC_FAIL, "can not write to log object");
     *pstatus = REGRESSION_TEST_FAILED;
@@ -6434,17 +6435,17 @@ REGRESSION_TEST(SDK_API_INKTextLog) (Reg
 //////////////////////////////////////////////
 
 REGRESSION_TEST(SDK_API_INKMgmtGet) (RegressionTest * test, int atype, int *pstatus) {
-  char *CONFIG_PARAM_COUNTER_NAME = "proxy.process.http.total_parent_proxy_connections";
+  const char *CONFIG_PARAM_COUNTER_NAME = "proxy.process.http.total_parent_proxy_connections";
   int CONFIG_PARAM_COUNTER_VALUE = 0;
 
-  char *CONFIG_PARAM_FLOAT_NAME = "proxy.config.http.background_fill_completed_threshold";
+  const char *CONFIG_PARAM_FLOAT_NAME = "proxy.config.http.background_fill_completed_threshold";
   float CONFIG_PARAM_FLOAT_VALUE = 0.5;
 
-  char *CONFIG_PARAM_INT_NAME = "proxy.config.http.cache.http";
+  const char *CONFIG_PARAM_INT_NAME = "proxy.config.http.cache.http";
   int CONFIG_PARAM_INT_VALUE = 1;
 
-  char *CONFIG_PARAM_STRING_NAME = "proxy.config.product_name";
-  char *CONFIG_PARAM_STRING_VALUE = "Traffic Server";
+  const char *CONFIG_PARAM_STRING_NAME = "proxy.config.product_name";
+  const char *CONFIG_PARAM_STRING_VALUE = "Traffic Server";
 
   *pstatus = REGRESSION_TEST_INPROGRESS;
 
@@ -6947,12 +6948,12 @@ static int
 checkHttpTxnParentProxy(ContData * data, INKHttpTxn txnp)
 {
 
-  char *hostname = "txnpp.example.com";
+  const char *hostname = "txnpp.example.com";
   int port = 10180;
   char *hostnameget = NULL;
   int portget = 0;
 
-  if (INKHttpTxnParentProxySet(txnp, hostname, port) != INK_SUCCESS) {
+  if (INKHttpTxnParentProxySet(txnp, (char*)hostname, port) != INK_SUCCESS) {
     SDK_RPRINT(data->test, "INKHttpTxnParentProxySet", "TestCase1", TC_FAIL,
                "INKHttpTxnParentProxySet doesn't return INK_SUCCESS");
     SDK_RPRINT(data->test, "INKHttpTxnParentProxyGet", "TestCase1", TC_FAIL,
@@ -8346,7 +8347,7 @@ cont_test_handler(INKCont contp, INKEven
 
       /* Check if browser response body is the one we expected */
       char *body_response = get_body_ptr(data->browser->response);
-      char *body_expected;
+      const char *body_expected;
       if (data->test_case == TEST_CASE_CONNECT_ID1) {
         body_expected = "Body for response 9";
       } else {

Modified: incubator/trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/Main.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/Main.cc Tue Apr 27 19:12:22 2010
@@ -310,7 +310,7 @@ int n_argument_descriptions = SIZE(argum
 
 #define set_rlimit(name,max_it,ulim_it) max_out_limit(#name, name, max_it, ulim_it)
 static rlim_t
-max_out_limit(char *name, int which, bool max_it = true, bool unlim_it = true)
+max_out_limit(const char *name, int which, bool max_it = true, bool unlim_it = true)
 {
   struct rlimit rl;
 
@@ -727,7 +727,7 @@ cmd_check_internal(char *cmd, bool fix =
 //  acc.clear_cache();
 //#endif
 
-  char *err = NULL;
+  const char *err = NULL;
   theStore.delete_all();
   if ((err = theStore.read_config())) {
     printf("%s, %s failed\n", err, n);
@@ -787,7 +787,7 @@ cmd_clear(char *cmd)
   }
 
   if (c_all || c_cache) {
-    char *err = NULL;
+    const char *err = NULL;
     theStore.delete_all();
     if ((err = theStore.read_config())) {
       printf("%s, CLEAR failed\n", err);
@@ -837,9 +837,9 @@ static int cmd_help(char *cmd);
 
 static struct CMD
 {
-  char *n;                      // name
-  char *d;                      // description (part of a line)
-  char *h;                      // help string (multi-line)
+  const char *n;                      // name
+  const char *d;                      // description (part of a line)
+  const char *h;                      // help string (multi-line)
   int (*f) (char *);
 }
 commands[] = {
@@ -901,9 +901,9 @@ cmd_index(char *p)
 {
   p += strspn(p, " \t");
   for (int c = 0; c < N_CMDS; c++) {
-    char *l = commands[c].n;
+    const char *l = commands[c].n;
     while (l) {
-      char *s = strchr(l, '/');
+      const char *s = strchr(l, '/');
       char *e = strpbrk(p, " \t\n");
       int len = s ? s - l : strlen(l);
       int lenp = e ? e - p : strlen(p);

Modified: incubator/trafficserver/traffic/trunk/proxy/ParentSelection.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/ParentSelection.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/ParentSelection.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/ParentSelection.cc Tue Apr 27 19:12:22 2010
@@ -51,12 +51,12 @@ static const char modulePrefix[] = "[Par
 static Ptr<ProxyMutex> reconfig_mutex = NULL;
 
 // Config var names
-static char *file_var = "proxy.config.http.parent_proxy.file";
-static char *default_var = "proxy.config.http.parent_proxies";
-static char *retry_var = "proxy.config.http.parent_proxy.retry_time";
-static char *enable_var = "proxy.config.http.parent_proxy_routing_enable";
-static char *threshold_var = "proxy.config.http.parent_proxy.fail_threshold";
-static char *dns_parent_only_var = "proxy.config.http.no_dns_just_forward_to_parent";
+static const char *file_var = "proxy.config.http.parent_proxy.file";
+static const char *default_var = "proxy.config.http.parent_proxies";
+static const char *retry_var = "proxy.config.http.parent_proxy.retry_time";
+static const char *enable_var = "proxy.config.http.parent_proxy_routing_enable";
+static const char *threshold_var = "proxy.config.http.parent_proxy.fail_threshold";
+static const char *dns_parent_only_var = "proxy.config.http.no_dns_just_forward_to_parent";
 
 static const char *ParentResultStr[] = {
   "Parent_Undefined",
@@ -639,7 +639,7 @@ ParentRecord::ProcessParents(char *val)
   const char *current;
   int port;
   char *tmp;
-  char *errPtr;
+  const char *errPtr;
 
   if (parents != NULL) {
     return "Can not specify more than one set of parents";
@@ -1306,7 +1306,7 @@ EXCLUSIVE_REGRESSION_TEST(PARENTSELECTIO
   FP RE(verify(result, PARENT_SPECIFIED, "pilot_net", 80), 4)
     // Test 5
     ST(5) REINIT br(request, "www.snoopy.net");
-  char *snoopy_dog = "http://www.snoopy.com/";
+  const char *snoopy_dog = "http://www.snoopy.com/";
   request->hdr->url_set(snoopy_dog, strlen(snoopy_dog));
   FP RE(verify(result, PARENT_SPECIFIED, "odie", 80) + verify(result, PARENT_SPECIFIED, "garfield", 80), 5)
     // Test 6
@@ -1440,7 +1440,7 @@ EXCLUSIVE_REGRESSION_TEST(PARENTSELECTIO
 
 // verify returns 1 iff the test passes
 int
-verify(ParentResult * r, ParentResultType e, char *h, int p)
+verify(ParentResult * r, ParentResultType e, const char *h, int p)
 {
   if (is_debug_tag_set("parent_select"))
     show_result(r);
@@ -1449,7 +1449,7 @@ verify(ParentResult * r, ParentResultTyp
 
 // br creates an HttpRequestData object
 void
-br(HttpRequestData * h, char *os_hostname, int dest_ip)
+br(HttpRequestData * h, const char *os_hostname, int dest_ip)
 {
   int hostname_len = strlen(os_hostname) + 1;
 

Modified: incubator/trafficserver/traffic/trunk/proxy/ParentSelection.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/ParentSelection.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/ParentSelection.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/ParentSelection.h Tue Apr 27 19:12:22 2010
@@ -220,8 +220,8 @@ int parentSelection_CB(const char *name,
 
 // Unit Test Functions
 void show_result(ParentResult * aParentResult);
-void br(HttpRequestData * h, char *os_hostname, int dest_ip = 0);       // short for build request
-int verify(ParentResult * r, ParentResultType e, char *h, int p);
+void br(HttpRequestData * h, const char *os_hostname, int dest_ip = 0);       // short for build request
+int verify(ParentResult * r, ParentResultType e, const char *h, int p);
 
 /*
   For supporting multiple Socks servers, we essentially use the

Modified: incubator/trafficserver/traffic/trunk/proxy/Plugin.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/Plugin.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/Plugin.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/Plugin.cc Tue Apr 27 19:12:22 2010
@@ -48,8 +48,8 @@
 //   LD_SHAREDCMD=ld -G
 
 
-static char *plugin_dir = ".";
-static char *extensions_dir = ".";
+static const char *plugin_dir = ".";
+static const char *extensions_dir = ".";
 static PluginDB *plugin_db = NULL;
 
 typedef void (*init_func_t) (int argc, char *argv[]);
@@ -91,7 +91,7 @@ dll_open(char *fn, bool global)
 }
 
 static void *
-dll_findsym(void *dlp, char *name)
+dll_findsym(void *dlp, const char *name)
 {
   return (void *) dlsym(dlp, name);
 }
@@ -267,7 +267,7 @@ plugins_exist(const char *config_dir)
   int fd;
   int plugin_count = 0;
 
-  RecGetRecordString_Xmalloc("proxy.config.plugin.plugin_dir", &plugin_dir);
+  RecGetRecordString_Xmalloc("proxy.config.plugin.plugin_dir", (char**)&plugin_dir);
 
   snprintf(path, sizeof(path), "%s%splugin.config", config_dir, DIR_SEP);
   fd = open(path, O_RDONLY);
@@ -304,8 +304,8 @@ plugin_init(const char *config_dir, bool
     api_init();
     init_inkapi_stat_system();
 
-    RecGetRecordString_Xmalloc("proxy.config.plugin.plugin_dir", &plugin_dir);
-    RecGetRecordString_Xmalloc("proxy.config.plugin.extensions_dir", &extensions_dir);
+    RecGetRecordString_Xmalloc("proxy.config.plugin.plugin_dir", (char**)&plugin_dir);
+    RecGetRecordString_Xmalloc("proxy.config.plugin.extensions_dir", (char**)&extensions_dir);
 
     snprintf(path, sizeof(path), "%s%splugin.db", config_dir, DIR_SEP);
     plugin_db = new PluginDB(path);

Modified: incubator/trafficserver/traffic/trunk/proxy/Show.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/Show.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/Show.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/Show.h Tue Apr 27 19:12:22 2010
@@ -44,7 +44,7 @@ struct ShowCont:Continuation
   int iarg;
   char *sarg;
 
-  int show(char *s, ...)
+  int show(const char *s, ...)
   {
     va_list aap;
       va_start(aap, s);
@@ -96,7 +96,7 @@ struct ShowCont:Continuation
     return done(VIO::ABORT, event, e);
   }
 
-  int begin(char *name)
+  int begin(const char *name)
   {
     return show("<HTML>\n<HEAD><TITLE>%s</TITLE>\n"
                 "<BODY BGCOLOR=\"#ffffff\" FGCOLOR=\"#00ff00\">\n" "<H1>%s</H1>\n", name, name);

Modified: incubator/trafficserver/traffic/trunk/proxy/StatPages.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/StatPages.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/StatPages.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/StatPages.cc Tue Apr 27 19:12:22 2010
@@ -57,7 +57,7 @@ StatPagesManager::init()
 }
 
 void
-StatPagesManager::register_http(char *module, StatPagesFunc func)
+StatPagesManager::register_http(const char *module, StatPagesFunc func)
 {
   ink_release_assert(n_stat_pages < MAX_STAT_PAGES);
 

Modified: incubator/trafficserver/traffic/trunk/proxy/StatPages.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/StatPages.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/StatPages.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/StatPages.h Tue Apr 27 19:12:22 2010
@@ -95,7 +95,7 @@ struct StatPagesManager
 {
   void init();
 
-  inkcoreapi void register_http(char *hostname, StatPagesFunc func);
+  inkcoreapi void register_http(const char *hostname, StatPagesFunc func);
 
   // Private
   Action *handle_http(Continuation * cont, HTTPHdr * header, int client_ip);

Modified: incubator/trafficserver/traffic/trunk/proxy/StatSystem.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/StatSystem.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/StatSystem.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/StatSystem.cc Tue Apr 27 19:12:22 2010
@@ -475,7 +475,7 @@ start_stats_snap()
 
 
 
-static char **stat_names = NULL;
+static const char **stat_names = NULL;
 static int nstat_names = 0;
 
 static Action *
@@ -539,7 +539,7 @@ static void
 stat_callback_init()
 {
 
-  char *p;
+  const char *p;
   int i, j;
 
   statPagesManager.register_http("stat", stat_callback);
@@ -550,7 +550,7 @@ stat_callback_init()
     nstat_names++;
     //}
   }
-  stat_names = (char **) xmalloc(nstat_names * sizeof(char *));
+  stat_names = (const char **) xmalloc(nstat_names * sizeof(char *));
 
   j = 0;
   for (i = 0; RecordsConfig[i].value_type != INVALID; i++) {

Modified: incubator/trafficserver/traffic/trunk/proxy/StatSystem.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/StatSystem.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/StatSystem.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/StatSystem.h Tue Apr 27 19:12:22 2010
@@ -204,7 +204,7 @@ typedef enum { \
 struct RniTransactionStatsString_t
 {
   RniTransactionStat_t i;
-  char *name;
+  const char *name;
 };
 
 
@@ -237,7 +237,7 @@ typedef enum { \
 struct DynamicStatsString_t
 {
   DynamicStat_t i;
-  char *name;
+  const char *name;
 };
 
 extern HttpTransactionStatsString_t HttpTransactionStatsStrings[];

Modified: incubator/trafficserver/traffic/trunk/proxy/TestHook.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/TestHook.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/TestHook.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/TestHook.cc Tue Apr 27 19:12:22 2010
@@ -33,7 +33,7 @@
 #include "ParseRules.h"
 
 volatile int state_machine_count = 0;
-extern char *event_int_to_string(int event, char buffer[32] = NULL);
+extern const char *event_int_to_string(int event, char buffer[32] = NULL);
 
 struct Globals
 {
@@ -43,7 +43,7 @@ struct Globals
   int buffer_size;
   int default_body_size;
 
-  void get_env_int(int *var, char *env)
+  void get_env_int(int *var, const char *env)
   {
     char *s = getenv(env);
     if (s)

Modified: incubator/trafficserver/traffic/trunk/proxy/Update.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/Update.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/Update.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/Update.cc Tue Apr 27 19:12:22 2010
@@ -96,7 +96,7 @@ struct html_tag update_allowable_html_ta
 
 struct schemes_descriptor
 {
-  char *tag;
+  const char *tag;
   int tag_len;
 };
 
@@ -2565,7 +2565,7 @@ HtmlParser::MakeURL(char *url, char *sub
 }
 
 DynArray<char>*
-HtmlParser::PrependString(char *pre, int presize, char *sub, int subsize)
+HtmlParser::PrependString(const char *pre, int presize, char *sub, int subsize)
 {
   int n;
 

Modified: incubator/trafficserver/traffic/trunk/proxy/Update.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/Update.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/Update.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/Update.h Tue Apr 27 19:12:22 2010
@@ -371,8 +371,8 @@ extern struct dispatch_entry scheme_post
 
 struct html_tag
 {
-  char *tag;
-  char *attr;
+  const char *tag;
+  const char *attr;
 };
 
 /////////////////////////////////////////////////////////////////////////////
@@ -442,7 +442,7 @@ public:
   int ExtractURL(char **, char **);
   int ConstructURL(char **, char **);
   DynArray<char>*MakeURL(char *, char *, int, int);
-  DynArray<char>*PrependString(char *, int, char *, int);
+  DynArray<char>*PrependString(const char *, int, char *, int);
   bool _attr_matched;
 
   char *_url;

Modified: incubator/trafficserver/traffic/trunk/proxy/api/include/ts_private_frozen.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/api/include/ts_private_frozen.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/api/include/ts_private_frozen.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/api/include/ts_private_frozen.h Tue Apr 27 19:12:22 2010
@@ -298,7 +298,7 @@ extern "C"
  *  ??
  *  Return
  ****************************************************************************/
-  inkapi char *INKMatcherParseSrcIPConfigLine(char *line, INKMatcherLine ml);
+  inkapi const char *INKMatcherParseSrcIPConfigLine(char *line, INKMatcherLine ml);
 
 /****************************************************************************
  *  ??

Modified: incubator/trafficserver/traffic/trunk/proxy/congest/Congestion.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/congest/Congestion.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/congest/Congestion.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/congest/Congestion.cc Tue Apr 27 19:12:22 2010
@@ -38,9 +38,9 @@ RecRawStatBlock *congest_rsb;
 InkRand CongestionRand(123);
 
 static const char *congestPrefix = "[CongestionControl]";
-static char *congestVar = "proxy.config.http.congestion_control.filename";
-static char *congestEnabledVar = "proxy.config.http.congestion_control.enabled";
-static char *congestTimeVar = "proxy.config.http.congestion_control.localtime";
+static const char *congestVar = "proxy.config.http.congestion_control.filename";
+static const char *congestEnabledVar = "proxy.config.http.congestion_control.enabled";
+static const char *congestTimeVar = "proxy.config.http.congestion_control.localtime";
 
 static const matcher_tags congest_dest_tags = {
   "dest_host",
@@ -54,20 +54,20 @@ static const matcher_tags congest_dest_t
 #define CONGESTION_CONTROL_CONFIG_TIMEOUT 120
 /* default congestion control values */
 
-static char *default_max_connection_failures_var =
+static const char *default_max_connection_failures_var =
   "proxy.config.http.congestion_control.default.max_connection_failures";
-static char *default_fail_window_var = "proxy.config.http.congestion_control.default.fail_window";
-static char *default_proxy_retry_interval_var = "proxy.config.http.congestion_control.default.proxy_retry_interval";
-static char *default_client_wait_interval_var = "proxy.config.http.congestion_control.default.client_wait_interval";
-static char *default_wait_interval_alpha_var = "proxy.config.http.congestion_control.default.wait_interval_alpha";
-static char *default_live_os_conn_timeout_var = "proxy.config.http.congestion_control.default.live_os_conn_timeout";
-static char *default_live_os_conn_retries_var = "proxy.config.http.congestion_control.default.live_os_conn_retries";
-static char *default_dead_os_conn_timeout_var = "proxy.config.http.congestion_control.default.dead_os_conn_timeout";
-static char *default_dead_os_conn_retries_var = "proxy.config.http.congestion_control.default.dead_os_conn_retries";
-static char *default_max_connection_var = "proxy.config.http.congestion_control.default.max_connection";
-static char *default_error_page_var = "proxy.config.http.congestion_control.default.error_page";
-static char *default_congestion_scheme_var = "proxy.config.http.congestion_control.default.congestion_scheme";
-static char *default_snmp_var = "proxy.config.http.congestion_control.default.snmp";
+static const char *default_fail_window_var = "proxy.config.http.congestion_control.default.fail_window";
+static const char *default_proxy_retry_interval_var = "proxy.config.http.congestion_control.default.proxy_retry_interval";
+static const char *default_client_wait_interval_var = "proxy.config.http.congestion_control.default.client_wait_interval";
+static const char *default_wait_interval_alpha_var = "proxy.config.http.congestion_control.default.wait_interval_alpha";
+static const char *default_live_os_conn_timeout_var = "proxy.config.http.congestion_control.default.live_os_conn_timeout";
+static const char *default_live_os_conn_retries_var = "proxy.config.http.congestion_control.default.live_os_conn_retries";
+static const char *default_dead_os_conn_timeout_var = "proxy.config.http.congestion_control.default.dead_os_conn_timeout";
+static const char *default_dead_os_conn_retries_var = "proxy.config.http.congestion_control.default.dead_os_conn_retries";
+static const char *default_max_connection_var = "proxy.config.http.congestion_control.default.max_connection";
+static const char *default_error_page_var = "proxy.config.http.congestion_control.default.error_page";
+static const char *default_congestion_scheme_var = "proxy.config.http.congestion_control.default.congestion_scheme";
+static const char *default_snmp_var = "proxy.config.http.congestion_control.default.snmp";
 
 char *DEFAULT_error_page = xstrdup("congestion#retryAfter");
 int DEFAULT_max_connection_failures = 5;

Modified: incubator/trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/cust_log_fmt_cnvrt.cc Tue Apr 27 19:12:22 2010
@@ -67,7 +67,7 @@ static ArgumentDescription argument_desc
 };
 static int n_argument_descriptions = SIZE(argument_descriptions);
 
-static char *USAGE_LINE = "Usage: " PROGRAM_NAME " [-o output-file | -a] [-hnVw] [input-file ...]";
+static const char *USAGE_LINE = "Usage: " PROGRAM_NAME " [-o output-file | -a] [-hnVw] [input-file ...]";
 
 struct LogFormat
 {
@@ -121,7 +121,7 @@ LogObj::print_filters(ostream & os)
 
 
 char *
-create_escaped_string(char *input)
+create_escaped_string(const char *input)
 {
   ink_debug_assert(input);
   char *output = new char[strlen(input) * 2];   // worst case scenario
@@ -213,7 +213,7 @@ process_format(SimpleTokenizer * tok, Lo
 Filter *
 process_filter(SimpleTokenizer * tok)
 {
-  char *action = "REJECT";
+  const char *action = "REJECT";
 
   char *objName = tok->getNext();
   if (!objName)
@@ -222,7 +222,7 @@ process_filter(SimpleTokenizer * tok)
   if (!field)
     return 0;
 
-  char *oper = tok->getNext();
+  const char *oper = tok->getNext();
   if (!oper)
     return 0;
   if (strcasecmp(oper, "NOMATCH") == 0) {

Modified: incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrHeap.cc Tue Apr 27 19:12:22 2010
@@ -54,7 +54,7 @@ static HdrStrHeap str_proto_heap;
 void
 obj_describe(HdrHeapObjImpl * obj, bool recurse)
 {
-  static char *obj_names[] = { "EMPTY", "RAW", "URL", "HTTP_HEADER", "MIME_HEADER", "FIELD_BLOCK" };
+  static const char *obj_names[] = { "EMPTY", "RAW", "URL", "HTTP_HEADER", "MIME_HEADER", "FIELD_BLOCK" };
 
   Debug("http", "%s 0x%X: [T: %d, L: %4d, OBJFLAGS: %X]  ",
         obj_names[obj->m_type], obj, obj->m_type, obj->m_length, obj->m_obj_flags);

Modified: incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.cc Tue Apr 27 19:12:22 2010
@@ -271,7 +271,7 @@ HdrTest::test_parse_date()
 int
 HdrTest::test_format_date()
 {
-  static char *dates[] = {
+  static const char *dates[] = {
     "Sun, 06 Nov 1994 08:49:37 GMT",
     "Sun, 03 Jan 1999 08:49:37 GMT",
     "Sun, 05 Dec 1999 08:49:37 GMT",
@@ -286,11 +286,11 @@ HdrTest::test_format_date()
   int i;
   time_t t, t2, t3;
   char buffer[128], buffer2[128];
-  static char *envstr = "TZ=GMT0";
+  static const char *envstr = "TZ=GMT0";
   int failures = 0;
 
   // shift into GMT timezone for cftime conversions
-  putenv(envstr);
+  putenv((char*)envstr);
   tzset();
 
   for (i = 0; dates[i]; i++) {
@@ -432,7 +432,7 @@ HdrTest::test_url()
     url.print(print_buf, 1024, &new_length, &offset);
     print_buf[new_length] = '\0';
 
-    char *fail_text = NULL;
+    const char *fail_text = NULL;
 
     if (old_length == new_length) {
       if (memcmp(print_buf, strs[i], new_length) != 0)
@@ -575,7 +575,7 @@ HdrTest::test_http_parser_eos_boundary_c
 {
   struct
   {
-    char *msg;
+    const char *msg;
     int expected_result;
     int expected_bytes_consumed;
   } tests[] = {
@@ -782,10 +782,10 @@ HdrTest::test_http_hdr_print_and_copy()
 {
   static struct
   {
-    char *req;
-    char *req_tgt;
-    char *rsp;
-    char *rsp_tgt;
+    const char *req;
+    const char *req_tgt;
+    const char *rsp;
+    const char *rsp_tgt;
   } tests[] = {
     {
     "GET http://foo.com/bar.txt HTTP/1.0\r\n"
@@ -940,7 +940,7 @@ HdrTest::test_http_hdr_print_and_copy()
 
 /*-------------------------------------------------------------------------
   -------------------------------------------------------------------------*/
-static char *
+static const char *
 comp_http_hdr(HTTPHdr * h1, HTTPHdr * h2)
 {
 
@@ -1001,7 +1001,7 @@ HdrTest::test_http_hdr_copy_over_aux(int
   HTTPParser parser;
   const char *start;
   const char *end;
-  char *comp_str = NULL;
+  const char *comp_str = NULL;
 
     /*** (1) parse the request string into hdr ***/
 
@@ -1649,8 +1649,8 @@ HdrTest::test_accept_language_match()
 
   struct
   {
-    char *content_language;
-    char *accept_language;
+    const char *content_language;
+    const char *accept_language;
     float Q;
     int L;
     int I;
@@ -1716,8 +1716,8 @@ HdrTest::test_accept_charset_match()
 
   struct
   {
-    char *content_charset;
-    char *accept_charset;
+    const char *content_charset;
+    const char *accept_charset;
     float Q;
     int I;
   } test_cases[] = {
@@ -1782,7 +1782,7 @@ HdrTest::test_comma_vals()
 {
   static struct
   {
-    char *value;
+    const char *value;
     int value_count;
     struct
     {
@@ -1945,10 +1945,10 @@ HdrTest::test_set_comma_vals()
 {
   static struct
   {
-    char *old_raw;
+    const char *old_raw;
     int idx;
-    char *slice;
-    char *new_raw;
+    const char *slice;
+    const char *new_raw;
   } tests[] = {
     {
     "a,b,c", 0, "fred", "fred, b, c"}, {
@@ -2061,7 +2061,7 @@ HdrTest::test_comma_val_slice()
 {
   static struct
   {
-    char *str;
+    const char *str;
     int idx;
     int correct_offset;
     int correct_len;
@@ -2397,7 +2397,7 @@ HdrTest::test_parse_comma_list()
   -------------------------------------------------------------------------*/
 
 void
-HdrTest::bri_box(char *s)
+HdrTest::bri_box(const char *s)
 {
   int i, len;
 
@@ -2417,7 +2417,7 @@ HdrTest::bri_box(char *s)
   -------------------------------------------------------------------------*/
 
 int
-HdrTest::failures_to_status(char *testname, int nfail)
+HdrTest::failures_to_status(const char *testname, int nfail)
 {
   rprintf(rtest, "  HdrTest %s: %s\n", testname, ((nfail > 0) ? "FAILED" : "PASSED"));
   return ((nfail > 0) ? 0 : 1);

Modified: incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/hdrs/HdrTest.h Tue Apr 27 19:12:22 2010
@@ -78,8 +78,8 @@ private:
   int test_http_hdr_copy_over_aux(int testnum, const char *request, const char *response);
   int test_http_aux(const char *request, const char *response);
   int test_arena_aux(Arena * arena, int len);
-  void bri_box(char *s);
-  int failures_to_status(char *testname, int nfail);
+  void bri_box(const char *s);
+  int failures_to_status(const char *testname, int nfail);
 };
 
 #endif

Modified: incubator/trafficserver/traffic/trunk/proxy/hdrs/HttpCompat.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/hdrs/HttpCompat.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/hdrs/HttpCompat.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/hdrs/HttpCompat.cc Tue Apr 27 19:12:22 2010
@@ -193,7 +193,7 @@ HttpCompat::parse_tok_list(StrList * lis
 //////////////////////////////////////////////////////////////////////////////
 
 bool
-HttpCompat::lookup_param_in_strlist(StrList * param_list, char *param_name, char *param_val, int param_val_length)
+HttpCompat::lookup_param_in_strlist(StrList * param_list,  const char *param_name, char *param_val, int param_val_length)
 {
   int cnt;
   const char *s, *t;
@@ -264,7 +264,7 @@ HttpCompat::lookup_param_in_strlist(StrL
 
 bool
 HttpCompat::lookup_param_in_semicolon_string(const char *semicolon_string, int semicolon_string_len,
-                                             char *param_name, char *param_val, int param_val_length)
+                                             const char *param_name, char *param_val, int param_val_length)
 {
   StrList l;
   bool result;

Modified: incubator/trafficserver/traffic/trunk/proxy/hdrs/HttpCompat.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/hdrs/HttpCompat.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/hdrs/HttpCompat.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/hdrs/HttpCompat.h Tue Apr 27 19:12:22 2010
@@ -47,10 +47,10 @@ public:
 
   static void parse_tok_list(StrList * list, int trim_quotes, const char *comma_list_str, char tok);
 
-  static bool lookup_param_in_strlist(StrList * param_list, char *param_name, char *param_val, int param_val_length);
+  static bool lookup_param_in_strlist(StrList * param_list, const char *param_name, char *param_val, int param_val_length);
 
   static bool lookup_param_in_semicolon_string(const char *semicolon_string, int semicolon_string_len,
-                                               char *param_name, char *param_val, int param_val_length);
+                                               const char *param_name, char *param_val, int param_val_length);
 
   static void parse_mime_type(const char *mime_string, char *type, char *subtype, int type_len, int subtype_len);
 

Modified: incubator/trafficserver/traffic/trunk/proxy/hdrs/MIME.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/hdrs/MIME.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/hdrs/MIME.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/hdrs/MIME.cc Tue Apr 27 19:12:22 2010
@@ -904,7 +904,7 @@ mime_init_cache_control_cooking_masks()
 {
   static struct
   {
-    char *name;
+    const char *name;
     inku32 mask;
   } cc_mask_table[] = {
     {
@@ -2939,7 +2939,7 @@ void
 mime_field_block_describe(HdrHeapObjImpl * raw, bool recurse)
 {
   unsigned int i;
-  static char *readiness_names[] = { "EMPTY", "DETACHED", "LIVE", "DELETED" };
+  static const char *readiness_names[] = { "EMPTY", "DETACHED", "LIVE", "DELETED" };
 
   MIMEFieldBlockImpl *obj = (MIMEFieldBlockImpl *) raw;
 

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.cc Tue Apr 27 19:12:22 2010
@@ -58,11 +58,11 @@
 ////////////////////////////////////////////////////////////////////////
 
 char *
-HttpBodyFactory::fabricate_with_old_api(char *type, HttpTransact::State * context,
+HttpBodyFactory::fabricate_with_old_api(const char *type, HttpTransact::State * context,
                                         int max_buffer_length, int *resulting_buffer_length,
                                         char content_language_out[256],
                                         char content_type_out[256],
-                                        HTTPStatus status_code, char *reason_or_null, char *format, va_list ap)
+                                        HTTPStatus status_code, const char *reason_or_null, const char *format, va_list ap)
 {
   char *buffer = NULL;
   const char *lang_ptr = NULL;
@@ -381,7 +381,7 @@ HttpBodyFactory::HttpBodyFactory()
   // set up management configuration-change callbacks //
   //////////////////////////////////////////////////////
 
-  static char *config_record_names[] = {
+  static const char *config_record_names[] = {
     "proxy.config.body_factory.enable_customizations",
     "proxy.config.body_factory.enable_logging",
     "proxy.config.body_factory.template_sets_dir",
@@ -419,7 +419,7 @@ HttpBodyFactory::~HttpBodyFactory()
 char *
 HttpBodyFactory::fabricate(StrList * acpt_language_list,
                            StrList * acpt_charset_list,
-                           char *type, HttpTransact::State * context,
+                           const char *type, HttpTransact::State * context,
                            int *buffer_length_return,
                            const char **content_language_return,
                            const char **content_charset_return, const char **set_return)

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpBodyFactory.h Tue Apr 27 19:12:22 2010
@@ -156,17 +156,17 @@ public:
   ///////////////////////
   // primary user APIs //
   ///////////////////////
-  char *fabricate_with_old_api(char *type, HttpTransact::State * context,
+  char *fabricate_with_old_api(const char *type, HttpTransact::State * context,
                                int max_buffer_length, int *resulting_buffer_length,
                                char content_language_out[256],
                                char content_type_out[256],
-                               HTTPStatus status_code, char *reason_or_null, char *format, va_list ap);
+                               HTTPStatus status_code, const char *reason_or_null, const char *format, va_list ap);
 
-  char *fabricate_with_old_api_build_va(char *type, HttpTransact::State * context,
+  char *fabricate_with_old_api_build_va(const char *type, HttpTransact::State * context,
                                         int max_buffer_length, int *resulting_buffer_length,
                                         char content_language_out[256],
                                         char content_type_out[256],
-                                        HTTPStatus status_code, char *reason_or_null, char *format, ...)
+                                        HTTPStatus status_code, const char *reason_or_null, const char *format, ...)
   {
     va_list ap;
       va_start(ap, format);
@@ -182,7 +182,7 @@ private:
 
   char *fabricate(StrList * acpt_language_list,
                   StrList * acpt_charset_list,
-                  char *type, HttpTransact::State * context,
+                  const char *type, HttpTransact::State * context,
                   int *resulting_buffer_length,
                   const char **content_language_return,
                   const char **content_charset_return, const char **set_return = NULL);

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpConfig.cc Tue Apr 27 19:12:22 2010
@@ -1689,7 +1689,7 @@ read_string(FILE * fp, char *buf, int si
 }
 
 static bool
-store_error_message(char *err_msg_buf, int buf_size, char *fmt, ...)
+store_error_message(char *err_msg_buf, int buf_size, const char *fmt, ...)
 {
   if (likely(err_msg_buf && buf_size > 0)) {
     char buf[2048];

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.cc Tue Apr 27 19:12:22 2010
@@ -52,7 +52,7 @@ char *
 HttpMessageBody::MakeErrorBodyVA(int max_buffer_length,
                                  int *resulting_buffer_length,
                                  const HttpConfigParams * config,
-                                 HTTPStatus status_code, char *reason, char *format, va_list va)
+                                 HTTPStatus status_code, const char *reason, const char *format, va_list va)
 {
   char *p, *outbuf = NULL;
   char error_title[128];

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpMessageBody.h Tue Apr 27 19:12:22 2010
@@ -54,7 +54,7 @@ public:
   static char *MakeErrorBodyVA(int max_buffer_length,
                                int *resulting_buffer_length,
                                const HttpConfigParams * config,
-                               HTTPStatus status_code, char *reason_or_null, char *format, va_list va);
+                               HTTPStatus status_code, const char *reason_or_null, const char *format, va_list va);
 };
 
 #endif

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpPages.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpPages.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpPages.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpPages.cc Tue Apr 27 19:12:22 2010
@@ -91,7 +91,7 @@ HttpPagesHandler::extract_id(const char 
 }
 
 void
-HttpPagesHandler::dump_hdr(HTTPHdr * hdr, char *desc)
+HttpPagesHandler::dump_hdr(HTTPHdr *hdr, const char *desc)
 {
 
   if (hdr->valid()) {

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpPages.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpPages.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpPages.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpPages.h Tue Apr 27 19:12:22 2010
@@ -69,7 +69,7 @@ public:
 private:
 
   ink64 extract_id(const char *query);
-  void dump_hdr(HTTPHdr * hdr, char *desc);
+  void dump_hdr(HTTPHdr *hdr, const char *desc);
   void dump_tunnel_info(HttpSM * sm);
   void dump_history(HttpSM * sm);
   int dump_sm(HttpSM * sm);

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.cc Tue Apr 27 19:12:22 2010
@@ -6026,7 +6026,7 @@ HttpSM::setup_cache_transfer_to_transfor
 
 void
 HttpSM::setup_cache_write_transfer(HttpCacheSM * c_sm,
-                                   VConnection * source_vc, HTTPInfo * store_info, int skip_bytes, char *name)
+                                   VConnection * source_vc, HTTPInfo * store_info, int skip_bytes, const char *name)
 {
 
   ink_assert(c_sm->cache_write_vc != NULL);
@@ -7135,7 +7135,7 @@ HttpSM::dump_state_on_assert()
 }
 
 void
-HttpSM::dump_state_hdr(HTTPHdr * h, char *s)
+HttpSM::dump_state_hdr(HTTPHdr *h, const char *s)
 {
 
   // Dump the client request if available

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.h?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpSM.h Tue Apr 27 19:12:22 2010
@@ -251,14 +251,14 @@ public:
 
   // Debugging routines to dump the SM history, hdrs
   void dump_state_on_assert();
-  void dump_state_hdr(HTTPHdr * h, char *s);
+  void dump_state_hdr(HTTPHdr *h, const char *s);
 
   // Functions for manipulating api hooks
   void txn_hook_append(INKHttpHookID id, INKContInternal * cont);
   void txn_hook_prepend(INKHttpHookID id, INKContInternal * cont);
   APIHook *txn_hook_get(INKHttpHookID id);
 
-  void add_history_entry(char *fileline, int event, int reentrant);
+  void add_history_entry(const char *fileline, int event, int reentrant);
   void add_cache_sm();
   bool decide_cached_url(URL * s_url);
 
@@ -292,7 +292,7 @@ protected:
 
   struct History
   {
-    char *fileline;
+    const char *fileline;
     unsigned short event;
     short reentrancy;
   };
@@ -463,7 +463,7 @@ protected:
   void setup_push_transfer_to_cache();
   void setup_transform_to_server_transfer();
   void setup_cache_write_transfer(HttpCacheSM * c_sm,
-                                  VConnection * source_vc, HTTPInfo * store_info, int skip_bytes, char *name);
+                                  VConnection * source_vc, HTTPInfo * store_info, int skip_bytes, const char *name);
   void issue_cache_update();
   void perform_cache_write_action();
   void perform_transform_cache_write_action();
@@ -579,7 +579,7 @@ HttpSM::write_response_header_into_buffe
 }
 
 inline void
-HttpSM::add_history_entry(char *fileline, int event, int reentrant)
+HttpSM::add_history_entry(const char *fileline, int event, int reentrant)
 {
   int pos = history_pos++ % HISTORY_SIZE;
   history[pos].fileline = fileline;

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc?rev=938607&r1=938606&r2=938607&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc Tue Apr 27 19:12:22 2010
@@ -2222,7 +2222,7 @@ HttpTransact::HandleBadPushRespHdr(State
 }
 
 void
-HttpTransact::HandlePushError(State * s, char *reason)
+HttpTransact::HandlePushError(State *s, const char *reason)
 {
   s->client_info.keep_alive = HTTP_NO_KEEPALIVE;
 
@@ -4863,7 +4863,7 @@ HttpTransact::handle_cache_operation_on_
   HTTPHdr *base_response = NULL;
   HTTPStatus server_response_code = HTTP_STATUS_NONE;
   HTTPStatus client_response_code = HTTP_STATUS_NONE;
-  char *warn_text = NULL;
+  const char *warn_text = NULL;
   bool cacheable = false;
 
   cacheable = is_response_cacheable(s, &s->hdr_info.client_request, &s->hdr_info.server_response);
@@ -5347,7 +5347,7 @@ HttpTransact::handle_no_cache_operation_
 
   bool keep_alive = true;
   keep_alive = ((s->current.server->keep_alive == HTTP_KEEPALIVE) || (s->current.server->keep_alive == HTTP_PIPELINE));
-  char *warn_text = NULL;
+  const char *warn_text = NULL;
 
   switch (s->hdr_info.server_response.status_get()) {
   case HTTP_STATUS_OK:
@@ -7654,8 +7654,7 @@ HttpTransact::setup_ftp_request(State * 
   // url.                                                        //
   /////////////////////////////////////////////////////////////////
   if (r->presence(MIME_PRESENCE_AUTHORIZATION)) {
-    if (!HttpTransactHeaders::
-        generate_basic_authorization_from_request(&s->arena, r, &s->ftp_info->username, &s->ftp_info->password)) {
+    if (!HttpTransactHeaders::generate_basic_authorization_from_request(&s->arena, r, (char**)&s->ftp_info->username, &s->ftp_info->password)) {
       build_error_response(s, HTTP_STATUS_BAD_REQUEST, "Bad HTTP Request For FTP Object", "ftp#bad_request", "");
       s->next_action = PROXY_SEND_ERROR_CACHE_NOOP;;
       return false;
@@ -8884,8 +8883,8 @@ HttpTransact::handle_parent_died(State *
 void
 HttpTransact::handle_server_died(State * s)
 {
-  char *reason = NULL;
-  char *body_type = "UNKNOWN";
+  const char *reason = NULL;
+  const char *body_type = "UNKNOWN";
   HTTPStatus status = HTTP_STATUS_BAD_GATEWAY;
 
   ////////////////////////////////////////////////////////
@@ -9035,7 +9034,7 @@ HttpTransact::handle_server_died(State *
   // now add a default body, which is either the //
   // ftp error text or the reason phrase         //
   /////////////////////////////////////////////////
-  char *body_text;
+  const char *body_text;
   if ((s->next_hop_scheme == URL_WKSIDX_FTP) && (s->ftp_info->error_msg))
     body_text = s->ftp_info->error_msg;
   else
@@ -9403,12 +9402,11 @@ HttpTransact::build_response(State * s,
 //
 //////////////////////////////////////////////////////////////////////////////
 void
-HttpTransact::build_error_response(State * s,
-                                   HTTPStatus status_code,
-                                   char *reason_phrase_or_null, char *error_body_type, char *format, ...)
+HttpTransact::build_error_response(State *s, HTTPStatus status_code, const char *reason_phrase_or_null,
+                                   const char *error_body_type, const char *format, ...)
 {
   va_list ap;
-  char *reason_phrase;
+  const char *reason_phrase;
   URL *url;
   char *url_string;
   char body_language[256], body_type[256];
@@ -9600,7 +9598,7 @@ HttpTransact::build_redirect_response(St
   URL *u;
   const char *old_host;
   int old_host_len;
-  char *new_url = NULL;
+  const char *new_url = NULL;
   int new_url_len;
   char *to_free = NULL;
 
@@ -9703,7 +9701,7 @@ HttpTransact::get_error_string(int erno)
 const char *
 HttpTransact::FtpReplyCodeToReasonPhrase(int code)
 {
-  char *msg = "Unspecified Reply";
+  const char *msg = "Unspecified Reply";
 
   switch (code) {
   case 110:



Mime
View raw message