svn commit: r1712831 - in /serf/trunk/test/MockHTTPinC: MockHTTP.h MockHTTP_server.c

[rhuijben]

Author: rhuijben
Date: Thu Nov  5 17:36:59 2015
New Revision: 1712831

URL: http://svn.apache.org/viewvc?rev=1712831&view=rev
Log:
Resolve some warnings in the mockhttp server by returing port numbers as
apr_port_t.

* test/MockHTTPinC/MockHTTP.h
  (mhServerPortNr,
   mhProxyPortNr,
   mhServerByIDPortNr): Tweak return type.

* test/MockHTTPinC/MockHTTP_server.c
  (mhServerByIDPortNr.
   mhServerPortNr,
   mhProxyPortNr): Tweak return type.

Modified:
    serf/trunk/test/MockHTTPinC/MockHTTP.h
    serf/trunk/test/MockHTTPinC/MockHTTP_server.c

Modified: serf/trunk/test/MockHTTPinC/MockHTTP.h
URL: 
http://svn.apache.org/viewvc/serf/trunk/test/MockHTTPinC/MockHTTP.h?rev=1712831&r1=1712830&r2=1712831&view=diff
==============================================================================
--- serf/trunk/test/MockHTTPinC/MockHTTP.h (original)
+++ serf/trunk/test/MockHTTPinC/MockHTTP.h Thu Nov  5 17:36:59 2015
@@ -572,17 +572,17 @@ mhError_t mhRunServerLoop(MockHTTP *mh);
 /**
  * Get the actual port number on which the server is listening.
  */
-unsigned int mhServerPortNr(const MockHTTP *mh);
+apr_port_t mhServerPortNr(const MockHTTP *mh);
 
 /**
  * Get the actual port number on which the proxy is listening.
  */
-unsigned int mhProxyPortNr(const MockHTTP *mh);
+apr_port_t mhProxyPortNr(const MockHTTP *mh);
 
 /**
  * Get the actual port number on which server with id serverID is listening.
  */
-unsigned int mhServerByIDPortNr(const MockHTTP *mh, const char *serverID);
+apr_port_t mhServerByIDPortNr(const MockHTTP *mh, const char *serverID);
 
 
 /******************************************************************************

Modified: serf/trunk/test/MockHTTPinC/MockHTTP_server.c
URL: 
http://svn.apache.org/viewvc/serf/trunk/test/MockHTTPinC/MockHTTP_server.c?rev=1712831&r1=1712830&r2=1712831&view=diff
==============================================================================
--- serf/trunk/test/MockHTTPinC/MockHTTP_server.c (original)
+++ serf/trunk/test/MockHTTPinC/MockHTTP_server.c Thu Nov  5 17:36:59 2015
@@ -1856,7 +1856,7 @@ mhSetServerMaxRequestsPerConn(mhServCtx_
     return ssb;
 }
 
-unsigned int mhServerByIDPortNr(const MockHTTP *mh, const char *serverID)
+apr_port_t mhServerByIDPortNr(const MockHTTP *mh, const char *serverID)
 {
     mhServCtx_t *ctx = mhFindServerByID(mh, serverID);
 
@@ -1868,12 +1868,12 @@ unsigned int mhServerByIDPortNr(const Mo
     return 0;
 }
 
-unsigned int mhServerPortNr(const MockHTTP *mh)
+apr_port_t mhServerPortNr(const MockHTTP *mh)
 {
     return mhServerByIDPortNr(mh, DEFAULT_SERVER_ID);
 }
 
-unsigned int mhProxyPortNr(const MockHTTP *mh)
+apr_port_t mhProxyPortNr(const MockHTTP *mh)
 {
     return mhServerByIDPortNr(mh, DEFAULT_PROXY_ID);
 }