You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2010/05/12 20:17:46 UTC

svn commit: r943608 - in /trafficserver/traffic/trunk/example: server-transform/server-transform.c thread-pool/psi.c

Author: jplevyak
Date: Wed May 12 18:17:46 2010
New Revision: 943608

URL: http://svn.apache.org/viewvc?rev=943608&view=rev
Log:
Fix 2 gcc 4.5 compilation issues. INKHttpStatus, in addition to having
strange capitalization doesn't have a error code and so uses
INK_ERROR which is a different enum.  gcc 4.5 is strict about such things.
This should really be fixed, but this patch at least cleans up the compile.

Modified:
    trafficserver/traffic/trunk/example/server-transform/server-transform.c
    trafficserver/traffic/trunk/example/thread-pool/psi.c

Modified: trafficserver/traffic/trunk/example/server-transform/server-transform.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/server-transform/server-transform.c?rev=943608&r1=943607&r2=943608&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/server-transform/server-transform.c (original)
+++ trafficserver/traffic/trunk/example/server-transform/server-transform.c Wed May 12 18:17:46 2010
@@ -744,7 +744,7 @@ server_response_ok(INKHttpTxn txnp)
     return 0;
   }
 
-  if ((resp_status = INKHttpHdrStatusGet(bufp, hdr_loc)) == INK_ERROR) {
+  if ((resp_status = INKHttpHdrStatusGet(bufp, hdr_loc)) == (INKHttpStatus)INK_ERROR) {
     INKError("Error in Getting Status from Server response");
     if (INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc) != INK_SUCCESS) {
       INKError("Unable to release handle to server request");

Modified: trafficserver/traffic/trunk/example/thread-pool/psi.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/thread-pool/psi.c?rev=943608&r1=943607&r2=943608&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/thread-pool/psi.c (original)
+++ trafficserver/traffic/trunk/example/thread-pool/psi.c Wed May 12 18:17:46 2010
@@ -1030,10 +1030,10 @@ transformable(INKHttpTxn txnp)
   INKHttpTxnServerRespGet(txnp, &bufp, &hdr_loc);
 
   resp_status = INKHttpHdrStatusGet(bufp, hdr_loc);
-  if (resp_status == INK_ERROR) {
+  if (resp_status == (INKHttpStatus)INK_ERROR) {
     INKError("[transformable] Error while getting http status");
   }
-  if ((resp_status == INK_ERROR) || (resp_status != INK_HTTP_STATUS_OK)) {
+  if ((resp_status == (INKHttpStatus)INK_ERROR) || (resp_status != INK_HTTP_STATUS_OK)) {
     INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
     return 0;
   }