Sfoglia il codice sorgente

Fixed typo mg_server_ports -> mg_server_port

Using
  typedef struct mg_server_port mg_server_ports;
to stay backwards-compatible
Philipp Hasper 6 anni fa
parent
commit
964011874e

+ 1 - 1
docs/APIReference.md

@@ -39,7 +39,7 @@ The content of both structures is not defined in the interface - they are only u
 * [`struct mg_option;`](api/mg_option.md)
 * [`struct mg_option;`](api/mg_option.md)
 * [`struct mg_request_info;`](api/mg_request_info.md)
 * [`struct mg_request_info;`](api/mg_request_info.md)
 * [`struct mg_response_info;`](api/mg_response_info.md)
 * [`struct mg_response_info;`](api/mg_response_info.md)
-* [`struct mg_server_ports;`](api/mg_server_ports.md)
+* [`struct mg_server_port;`](api/mg_server_port.md)
 
 
 
 
 ## Library API Functions
 ## Library API Functions

+ 1 - 1
docs/api/mg_get_ports.md

@@ -27,5 +27,5 @@ The function returns the number of ports actually stored in the buffer.
 
 
 ### See Also
 ### See Also
 
 
-* [`struct mg_server_ports;`](mg_server_ports.md)
+* [`struct mg_server_port;`](mg_server_port.md)
 * [`mg_get_server_ports();`](mg_get_server_ports.md)
 * [`mg_get_server_ports();`](mg_get_server_ports.md)

+ 2 - 2
docs/api/mg_get_server_ports.md

@@ -8,7 +8,7 @@
 | :--- | :--- | :--- |
 | :--- | :--- | :--- |
 |**`ctx`**|`const struct mg_context *`|The context for which the server ports are requested|
 |**`ctx`**|`const struct mg_context *`|The context for which the server ports are requested|
 |**`size`**|`int`|The size of the buffer to store the port information|
 |**`size`**|`int`|The size of the buffer to store the port information|
-|**`ports`**|`struct mg_server_ports *`|Buffer to store the port information|
+|**`ports`**|`struct mg_server_port *`|Buffer to store the port information|
 
 
 ### Return Value
 ### Return Value
 
 
@@ -25,4 +25,4 @@ The function returns the number of items in the list, or a negative value if an
 ### See Also
 ### See Also
 
 
 * [~~`mg_get_ports();`~~](mg_get_ports.md)
 * [~~`mg_get_ports();`~~](mg_get_ports.md)
-* [`struct mg_server_ports;`](mg_server_ports.md)
+* [`struct mg_server_port;`](mg_server_port.md)

+ 2 - 2
docs/api/mg_server_ports.md → docs/api/mg_server_port.md

@@ -1,6 +1,6 @@
 # Civetweb API Reference
 # Civetweb API Reference
 
 
-### `struct mg_server_ports;`
+### `struct mg_server_port;`
 
 
 ### Fields
 ### Fields
 
 
@@ -17,7 +17,7 @@
 
 
 ### Description
 ### Description
 
 
-A call to the function [`mg_get_server_ports()`](mg_get_server_ports.md) returns a list of structures with information about each running Civetweb service. These structures are of type `struct mg_server_ports` and contain the base information of each service.
+A call to the function [`mg_get_server_ports()`](mg_get_server_ports.md) returns a list of structures with information about each running Civetweb service. These structures are of type `struct mg_server_port` and contain the base information of each service.
 
 
 ### See Also
 ### See Also
 
 

+ 1 - 1
examples/embedded_c/embedded_c.c

@@ -917,7 +917,7 @@ main(int argc, char *argv[])
 	    0};
 	    0};
 	struct mg_callbacks callbacks;
 	struct mg_callbacks callbacks;
 	struct mg_context *ctx;
 	struct mg_context *ctx;
-	struct mg_server_ports ports[32];
+	struct mg_server_port ports[32];
 	int port_cnt, n;
 	int port_cnt, n;
 	int err = 0;
 	int err = 0;
 
 

+ 1 - 1
include/CivetServer.h

@@ -376,7 +376,7 @@ class CIVETWEB_CXX_API CivetServer
 	 *
 	 *
 	 * @return A vector of ports
 	 * @return A vector of ports
 	 */
 	 */
-	std::vector<struct mg_server_ports> getListeningPortsFull();
+	std::vector<struct mg_server_port> getListeningPortsFull();
 
 
 	/**
 	/**
 	 * getCookie(struct mg_connection *conn, const std::string &cookieName,
 	 * getCookie(struct mg_connection *conn, const std::string &cookieName,

+ 6 - 3
include/civetweb.h

@@ -681,7 +681,7 @@ enum {
 CIVETWEB_API const struct mg_option *mg_get_valid_options(void);
 CIVETWEB_API const struct mg_option *mg_get_valid_options(void);
 
 
 
 
-struct mg_server_ports {
+struct mg_server_port {
 	int protocol;    /* 1 = IPv4, 2 = IPv6, 3 = both */
 	int protocol;    /* 1 = IPv4, 2 = IPv6, 3 = both */
 	int port;        /* port number */
 	int port;        /* port number */
 	int is_ssl;      /* https port: 0 = no, 1 = yes */
 	int is_ssl;      /* https port: 0 = no, 1 = yes */
@@ -692,15 +692,18 @@ struct mg_server_ports {
 	int _reserved4;
 	int _reserved4;
 };
 };
 
 
+// Legacy name
+#define mg_server_ports mg_server_port
+
 
 
 /* Get the list of ports that civetweb is listening on.
 /* Get the list of ports that civetweb is listening on.
    The parameter size is the size of the ports array in elements.
    The parameter size is the size of the ports array in elements.
    The caller is responsibility to allocate the required memory.
    The caller is responsibility to allocate the required memory.
-   This function returns the number of struct mg_server_ports elements
+   This function returns the number of struct mg_server_port elements
    filled in, or <0 in case of an error. */
    filled in, or <0 in case of an error. */
 CIVETWEB_API int mg_get_server_ports(const struct mg_context *ctx,
 CIVETWEB_API int mg_get_server_ports(const struct mg_context *ctx,
                                      int size,
                                      int size,
-                                     struct mg_server_ports *ports);
+                                     struct mg_server_port *ports);
 
 
 
 
 #if defined(MG_LEGACY_INTERFACE) /* 2017-04-02 */
 #if defined(MG_LEGACY_INTERFACE) /* 2017-04-02 */

+ 3 - 3
src/CivetServer.cpp

@@ -622,7 +622,7 @@ CivetServer::urlEncode(const char *src,
 std::vector<int>
 std::vector<int>
 CivetServer::getListeningPorts()
 CivetServer::getListeningPorts()
 {
 {
-	std::vector<struct mg_server_ports> server_ports = getListeningPortsFull();
+	std::vector<struct mg_server_port> server_ports = getListeningPortsFull();
 
 
 	std::vector<int> ports(server_ports.size());
 	std::vector<int> ports(server_ports.size());
 	for (size_t i = 0; i < server_ports.size(); i++) {
 	for (size_t i = 0; i < server_ports.size(); i++) {
@@ -632,10 +632,10 @@ CivetServer::getListeningPorts()
 	return ports;
 	return ports;
 }
 }
 
 
-std::vector<struct mg_server_ports>
+std::vector<struct mg_server_port>
 CivetServer::getListeningPortsFull()
 CivetServer::getListeningPortsFull()
 {
 {
-	std::vector<struct mg_server_ports> server_ports(50);
+	std::vector<struct mg_server_port> server_ports(50);
 	int size = mg_get_server_ports(context,
 	int size = mg_get_server_ports(context,
 	                               (int)server_ports.size(),
 	                               (int)server_ports.size(),
 	                               &server_ports[0]);
 	                               &server_ports[0]);

+ 1 - 1
src/civetweb.c

@@ -3506,7 +3506,7 @@ mg_get_ports(const struct mg_context *ctx, size_t size, int *ports, int *ssl)
 int
 int
 mg_get_server_ports(const struct mg_context *ctx,
 mg_get_server_ports(const struct mg_context *ctx,
                     int size,
                     int size,
-                    struct mg_server_ports *ports)
+                    struct mg_server_port *ports)
 {
 {
 	int i, cnt = 0;
 	int i, cnt = 0;
 
 

+ 3 - 3
unittest/public_server.c

@@ -359,7 +359,7 @@ test_mg_start_stop_http_server_impl(int ipv6, int bound)
 	char client_err[256];
 	char client_err[256];
 	const struct mg_response_info *client_ri;
 	const struct mg_response_info *client_ri;
 	int client_res, ret;
 	int client_res, ret;
-	struct mg_server_ports portinfo[8];
+	struct mg_server_port portinfo[8];
 
 
 	mark_point();
 	mark_point();
 
 
@@ -600,7 +600,7 @@ START_TEST(test_mg_start_stop_https_server)
 	char client_err[256];
 	char client_err[256];
 	const struct mg_response_info *client_ri;
 	const struct mg_response_info *client_ri;
 	int client_res, ret;
 	int client_res, ret;
-	struct mg_server_ports portinfo[8];
+	struct mg_server_port portinfo[8];
 
 
 	ck_assert(ssl_cert != NULL);
 	ck_assert(ssl_cert != NULL);
 
 
@@ -714,7 +714,7 @@ START_TEST(test_mg_server_and_client_tls)
 	struct mg_context *ctx;
 	struct mg_context *ctx;
 
 
 	int ports_cnt;
 	int ports_cnt;
-	struct mg_server_ports ports[16];
+	struct mg_server_port ports[16];
 	struct mg_callbacks callbacks;
 	struct mg_callbacks callbacks;
 	char errmsg[256];
 	char errmsg[256];