trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zw...@apache.org
Subject svn commit: r1186299 - in /trafficserver/traffic/trunk: CHANGES proxy/api/ts/ts.h.in
Date Wed, 19 Oct 2011 16:14:28 GMT
Author: zwoop
Date: Wed Oct 19 16:14:27 2011
New Revision: 1186299

URL: http://svn.apache.org/viewvc?rev=1186299&view=rev
Log:
 TS-985 ts/ts.h uses C++ comments, which are technically not C.

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/proxy/api/ts/ts.h.in

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1186299&r1=1186298&r2=1186299&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Wed Oct 19 16:14:27 2011
@@ -1,5 +1,7 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.1
+  *) [TS-985] ts/ts.h uses C++ comments, which are technically not C.
+
   *) [TS-928] Compile problem in TsErrataUtil on FreeBSD 8.
 
   *) [TS-973] Eliminate proxy.config.http.verbose_via_str.

Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h.in?rev=1186299&r1=1186298&r2=1186299&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h.in (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h.in Wed Oct 19 16:14:27 2011
@@ -237,7 +237,7 @@ extern "C"
     TS_HTTP_POST_REMAP_HOOK,
     TS_HTTP_LAST_HOOK
   } TSHttpHookID;
-  #define TS_HTTP_READ_REQUEST_PRE_REMAP_HOOK TS_HTTP_PRE_REMAP_HOOK //backwards compat
+  #define TS_HTTP_READ_REQUEST_PRE_REMAP_HOOK TS_HTTP_PRE_REMAP_HOOK  /* backwards compat
*/
 
   typedef enum
   {
@@ -341,7 +341,7 @@ extern "C"
     TS_EVENT_INTERNAL_60201 = 60201,
     TS_EVENT_INTERNAL_60202 = 60202
   } TSEvent;
-  #define TS_EVENT_HTTP_READ_REQUEST_PRE_REMAP TS_EVENT_HTTP_PRE_REMAP //backwards compat
+  #define TS_EVENT_HTTP_READ_REQUEST_PRE_REMAP TS_EVENT_HTTP_PRE_REMAP /* backwards compat
*/
 
   typedef enum
   { TS_SRVSTATE_STATE_UNDEFINED = 0,
@@ -484,8 +484,8 @@ extern "C"
   typedef enum
   {
     TS_CONFIG_NULL = -1,
-    // The order of these enum's must match the order of
-    // struct OverridableHttpConfigParams in HttpConfig.h.
+    /* The order of these enum's must match the order of
+       struct OverridableHttpConfigParams in HttpConfig.h. */
     TS_CONFIG_URL_REMAP_PRISTINE_HOST_HDR,
     TS_CONFIG_HTTP_CHUNKING_ENABLED,
     TS_CONFIG_HTTP_NEGATIVE_CACHING_ENABLED,
@@ -543,7 +543,7 @@ extern "C"
     TS_CONFIG_HTTP_CACHE_FUZZ_MIN_TIME,
     TS_CONFIG_HTTP_DOC_IN_CACHE_SKIP_DNS,
 
-    // Strings and floats must come after all the integer configs
+    /* Strings and floats must come after all the integer configs */
     TS_CONFIG_HTTP_RESPONSE_SERVER_STR,
     TS_CONFIG_HTTP_CACHE_HEURISTIC_LM_FACTOR,
     TS_CONFIG_HTTP_CACHE_FUZZ_PROBABILITY,
@@ -1900,7 +1900,7 @@ extern "C"
 
    */
   tsapi TSReturnCode TSHttpHdrCopy(TSMBuffer dest_bufp, TSMLoc dest_offset, TSMBuffer src_bufp,
-                                      TSMLoc src_offset);
+                                   TSMLoc src_offset);
 
   tsapi void TSHttpHdrPrint(TSMBuffer bufp, TSMLoc offset, TSIOBuffer iobufp);
 
@@ -2078,10 +2078,9 @@ extern "C"
       @note The returned string is allocated and must be freed by the caller
       after use with @c TSfree.
   */
-  tsapi char* TSHttpTxnEffectiveUrlStringGet(
-    TSHttpTxn txnp, ///< Transaction.
-    int* length ///< String length return, may be @c NULL.
-  );
+  tsapi char* TSHttpTxnEffectiveUrlStringGet(TSHttpTxn txnp,
+                                             int* length /**< String length return, may
be @c NULL. */ 
+                                             );
   tsapi TSReturnCode TSHttpTxnClientRespGet(TSHttpTxn txnp, TSMBuffer* bufp, TSMLoc* offset);
   tsapi TSReturnCode TSHttpTxnServerReqGet(TSHttpTxn txnp, TSMBuffer* bufp, TSMLoc* offset);
   tsapi TSReturnCode TSHttpTxnServerRespGet(TSHttpTxn txnp, TSMBuffer* bufp, TSMLoc* offset);
@@ -2107,9 +2106,7 @@ extern "C"
       @return Client address for connection to client in transaction @a txnp.
 
    */
-  tsapi struct sockaddr const* TSHttpTxnClientAddrGet(
-    TSHttpTxn txnp ///< Transaction.
-  );
+  tsapi struct sockaddr const* TSHttpTxnClientAddrGet(TSHttpTxn txnp);
   /** Get the incoming address.
    
       @note The pointer is valid only for the current callback. Clients
@@ -2118,9 +2115,7 @@ extern "C"
       
       @return Local address of the client connection for transaction @a txnp.
   */
-  tsapi struct sockaddr const* TSHttpTxnIncomingAddrGet(
-    TSHttpTxn txnp ///< Transaction.
-  );
+  tsapi struct sockaddr const* TSHttpTxnIncomingAddrGet(TSHttpTxn txnp);
   /** Get the origin server address.
    * 
       @note The pointer is valid only for the current callback. Clients
@@ -2129,9 +2124,7 @@ extern "C"
       
       @return The address of the origin server for transaction @a txnp.
   */
-  tsapi struct sockaddr const* TSHttpTxnServerAddrGet(
-    TSHttpTxn txnp ///< Transaction.
-  );
+  tsapi struct sockaddr const* TSHttpTxnServerAddrGet(TSHttpTxn txnp);
   /** Set the origin server address.
 
       This must be invoked before the origin server address is looked up.
@@ -2139,10 +2132,9 @@ extern "C"
       
       @return @c TS_SUCCESS if the origin server address is set, @c TS_ERROR otherwise.
   */
-  tsapi TSReturnCode TSHttpTxnServerAddrSet(
-    TSHttpTxn txnp, ///< Transaction
-    struct sockaddr const* addr ///< Address for origin server.
-  );
+  tsapi TSReturnCode TSHttpTxnServerAddrSet(TSHttpTxn txnp,
+                                            struct sockaddr const* addr /**< Address for
origin server. */
+                                            );
 
   /** Get the next hop address.
    * 
@@ -2152,24 +2144,22 @@ extern "C"
       
       @return The address of the next hop for transaction @a txnp.
   */
-  tsapi struct sockaddr const* TSHttpTxnNextHopAddrGet(
-    TSHttpTxn txnp ///< Transaction.
-  );
+  tsapi struct sockaddr const* TSHttpTxnNextHopAddrGet(TSHttpTxn txnp);
 
   tsapi TSReturnCode TSHttpTxnClientFdGet(TSHttpTxn txnp, int* fdp);
   tsapi TSReturnCode TSHttpTxnOutgoingAddrSet(TSHttpTxn txnp, struct sockaddr const* addr);
   
-  /// @deprecated Use TSHttpTxnClientAddrGet
+  /** @deprecated Use TSHttpTxnClientAddrGet */
   tsapi TS_DEPRECATED unsigned int TSHttpTxnClientIPGet(TSHttpTxn txnp);
-  /// @deprecated Use TSHttpTxnClientAddrGet
+  /** @deprecated Use TSHttpTxnClientAddrGet */
   tsapi TS_DEPRECATED TSReturnCode TSHttpTxnClientRemotePortGet(TSHttpTxn txnp, int* portp);
-  /// @deprecated Use TSHttpTxnIncomingAddrGet
+  /** @deprecated Use TSHttpTxnIncomingAddrGet */
   tsapi TS_DEPRECATED int TSHttpTxnClientIncomingPortGet(TSHttpTxn txnp);
-  /// @deprecated Use TSHttpTxnServerAddrGet
+  /** @deprecated Use TSHttpTxnServerAddrGet */
   tsapi TS_DEPRECATED unsigned int TSHttpTxnServerIPGet(TSHttpTxn txnp);
-  /// @deprecated Use TSHttpTxnNextHopAddrGet
+  /** @deprecated Use TSHttpTxnNextHopAddrGet */
   tsapi TS_DEPRECATED unsigned int TSHttpTxnNextHopIPGet(TSHttpTxn txnp);
-  /// @deprecated Use TSHttpTxnNextHopAddrGet
+  /** @deprecated Use TSHttpTxnNextHopAddrGet */
   tsapi TS_DEPRECATED int TSHttpTxnNextHopPortGet(TSHttpTxn txnp);
 
   tsapi void TSHttpTxnErrorBodySet(TSHttpTxn txnp, char* buf, int buflength, char* mimetype);
@@ -2386,7 +2376,7 @@ extern "C"
   
   tsapi struct sockaddr const* TSNetVConnRemoteAddrGet(TSVConn vc);
 
-  /// @deprecated Use TSNetVConnRemoteAddrGet
+  /** @deprecated Use TSNetVConnRemoteAddrGet */
   tsapi TS_DEPRECATED int TSNetVConnRemotePortGet(TSVConn vc);
 
   /**
@@ -2410,9 +2400,8 @@ extern "C"
         or cancel the attempt to connect.
 
    */
-  tsapi TSAction TSNetConnect(
-    TSCont contp, ///< continuation that is called back when the attempted net connection
either succeeds or fails.
-    struct sockaddr const* to ///< Address to which to connect.
+  tsapi TSAction TSNetConnect(TSCont contp, /**< continuation that is called back when
the attempted net connection either succeeds or fails. */
+                              struct sockaddr const* to /**< Address to which to connect.
*/
   );
 
   tsapi TSAction TSNetAccept(TSCont contp, int port, int domain, int accept_threads);
@@ -2420,14 +2409,15 @@ extern "C"
   /* --------------------------------------------------------------------------
      DNS Lookups */
   tsapi TSAction TSHostLookup(TSCont contp, char* hostname, int namelen);
-  /// @deprecated Use TSHostLookupResultAddrGet
+  /**  @deprecated Use TSHostLookupResultAddrGet */
   tsapi TS_DEPRECATED unsigned int TSHostLookupResultIPGet(TSHostLookupResult lookup_result);
   tsapi struct sockaddr const* TSHostLookupResultAddrGet(TSHostLookupResult lookup_result);
-  /// @deprecated Use TSHttpTxnServerAddrSet
+  /** @deprecated Use TSHttpTxnServerAddrSet */
   tsapi TS_DEPRECATED void TSOSIpSet(TSHttpTxn txnp, unsigned int ip);
-  // TODO: Eventually, we might want something like this as well, but it requires
-  // support for building the HostDBInfo struct:
-  // tsapi void TSHostLookupResultSet(TSHttpTxn txnp, TSHostLookupResult result);
+  /* TODO: Eventually, we might want something like this as well, but it requires
+     support for building the HostDBInfo struct:
+     tsapi void TSHostLookupResultSet(TSHttpTxn txnp, TSHostLookupResult result);
+  */
 
   /* --------------------------------------------------------------------------
      Cache VConnections */



Mime
View raw message