svn commit: r1036076 - in /trafficserver/traffic/trunk: example/protocol/TxnSM.c proxy/InkAPI.cc proxy/InkAPITest.cc

[zwoop]

Author: zwoop
Date: Wed Nov 17 15:25:04 2010
New Revision: 1036076

URL: http://svn.apache.org/viewvc?rev=1036076&view=rev
Log:
TS-458 Fixes for mismatched APIs using "unsigned char*".

Modified:
    trafficserver/traffic/trunk/example/protocol/TxnSM.c
    trafficserver/traffic/trunk/proxy/InkAPI.cc
    trafficserver/traffic/trunk/proxy/InkAPITest.cc

Modified: trafficserver/traffic/trunk/example/protocol/TxnSM.c
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/protocol/TxnSM.c?rev=1036076&r1=1036075&r2=1036076&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/protocol/TxnSM.c (original)
+++ trafficserver/traffic/trunk/example/protocol/TxnSM.c Wed Nov 17 15:25:04 
2010
@@ -970,6 +970,6 @@ CacheKeyCreate(char *file_name)
   }
 
   /* TSCacheKeyDigestSet is to compute TSCackeKey from the input string */
-  TSCacheKeyDigestSet(key, (unsigned char *) file_name, strlen(file_name));
+  TSCacheKeyDigestSet(key, file_name, strlen(file_name));
   return key;
 }

Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1036076&r1=1036075&r2=1036076&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Wed Nov 17 15:25:04 2010
@@ -4138,7 +4138,7 @@ TSCacheKeyCreate(TSCacheKey *new_key)
 }
 
 TSReturnCode
-TSCacheKeyDigestSet(TSCacheKey key, const unsigned char *input, int length)
+TSCacheKeyDigestSet(TSCacheKey key, const char *input, int length)
 {
   if (sdk_sanity_check_cachekey(key) != TS_SUCCESS)
     return TS_ERROR;
@@ -4181,7 +4181,7 @@ TSCacheKeyDataTypeSet(TSCacheKey key, TS
 }
 
 TSReturnCode
-TSCacheKeyHostNameSet(TSCacheKey key, const unsigned char *hostname, int 
host_len)
+TSCacheKeyHostNameSet(TSCacheKey key, const char *hostname, int host_len)
 {
 #ifdef DEBUG
   if ((hostname == NULL) || (host_len <= 0))

Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: 
http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=1036076&r1=1036075&r2=1036076&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Wed Nov 17 15:25:04 2010
@@ -767,8 +767,8 @@ REGRESSION_TEST(SDK_API_TSCache) (Regres
   } else {
     SDK_RPRINT(test, "TSCacheKeyCreate", "TestCase1", TC_PASS, "ok");
   }
-  TSCacheKeyDigestSet(key, (unsigned char *) key_name, strlen(key_name));
-  TSCacheKeyDigestSet(key_cmp, (unsigned char *) key_name, strlen(key_name));
+  TSCacheKeyDigestSet(key, key_name, strlen(key_name));
+  TSCacheKeyDigestSet(key_cmp, key_name, strlen(key_name));
 
   if (memcmp(key, key_cmp, sizeof(TSCacheKey)) != 0) {
     SDK_RPRINT(test, "TSCacheKeySetDigest", "TestCase1", TC_FAIL, "digest is 
wrong");