Format source code (after some merges)

include/CivetServer.h

@@ -366,16 +366,16 @@ class CIVETWEB_CXX_API CivetServer
 	 * @return A vector of ports
 	 */
 
-	std::vector<int> getListeningPorts();
-
-	/**
-	 * getListeningPorts()
-	 *
-	 * Variant of getListeningPorts() returning the full port information
-	 * (protocol, SSL, ...)
-	 *
-	 * @return A vector of ports
-	 */
+	std::vector<int> getListeningPorts();
+
+	/**
+	 * getListeningPorts()
+	 *
+	 * Variant of getListeningPorts() returning the full port information
+	 * (protocol, SSL, ...)
+	 *
+	 * @return A vector of ports
+	 */
 	std::vector<struct mg_server_ports> getListeningPortsFull();
 
 	/**

src/CivetServer.cpp

@@ -608,8 +608,7 @@ CivetServer::urlEncode(const char *src,
 		dst.clear();
 
 	for (; src_len > 0; src++, src_len--) {
-		if (isalnum((unsigned char)*src)
-		    || strchr(dont_escape, *src) != NULL) {
+		if (isalnum((unsigned char)*src) || strchr(dont_escape, *src) != NULL) {
 			dst.push_back(*src);
 		} else {
 			dst.push_back('%');
@@ -619,32 +618,32 @@ CivetServer::urlEncode(const char *src,
 	}
 }
 
-std::vector<int>
-CivetServer::getListeningPorts()
-{
-	std::vector<struct mg_server_ports> server_ports = getListeningPortsFull();
-
-	std::vector<int> ports(server_ports.size());
-	for (size_t i = 0; i < server_ports.size(); i++) {
-		ports[i] = server_ports[i].port;
-	}
-
-	return ports;
-}
-
-std::vector<struct mg_server_ports>
-CivetServer::getListeningPortsFull()
-{
-	std::vector<struct mg_server_ports> server_ports(50);
-	int size = mg_get_server_ports(context,
-	                               (int)server_ports.size(),
-	                               &server_ports[0]);
-	if (size <= 0) {
-		server_ports.resize(0);
-		return server_ports;
-	}
-	server_ports.resize(size);
-	return server_ports;
+std::vector<int>
+CivetServer::getListeningPorts()
+{
+	std::vector<struct mg_server_ports> server_ports = getListeningPortsFull();
+
+	std::vector<int> ports(server_ports.size());
+	for (size_t i = 0; i < server_ports.size(); i++) {
+		ports[i] = server_ports[i].port;
+	}
+
+	return ports;
+}
+
+std::vector<struct mg_server_ports>
+CivetServer::getListeningPortsFull()
+{
+	std::vector<struct mg_server_ports> server_ports(50);
+	int size = mg_get_server_ports(context,
+	                               (int)server_ports.size(),
+	                               &server_ports[0]);
+	if (size <= 0) {
+		server_ports.resize(0);
+		return server_ports;
+	}
+	server_ports.resize(size);
+	return server_ports;
 }
 
 CivetServer::CivetConnection::CivetConnection()

src/civetweb.c

@@ -5950,7 +5950,7 @@ spawn_process(struct mg_connection *conn,
 			                fderr[1],
 			                strerror(ERRNO));
 		} else {
-			struct sigaction sa;
+			struct sigaction sa;
 
 			/* Keep stderr and stdout in two different pipes.
 			 * Stdout will be sent back to the client,
@@ -5968,9 +5968,9 @@ spawn_process(struct mg_connection *conn,
 			 * values, with one exception of SIGCHLD. According to
 			 * POSIX.1-2001 and Linux's implementation, SIGCHLD's handler
 			 * will leave unchanged after exec if it was set to be ignored.
-			 * Restore it to default action. */		
-			memset(&sa, 0, sizeof(sa));
-			sa.sa_handler = SIG_DFL;
+			 * Restore it to default action. */
+			memset(&sa, 0, sizeof(sa));
+			sa.sa_handler = SIG_DFL;
 			sigaction(SIGCHLD, &sa, NULL);
 
 			interp = conn->dom_ctx->config[CGI_INTERPRETER];
@@ -9072,14 +9072,14 @@ print_dir_entry(struct de *de)
 	}
 	mg_url_encode(de->file_name, href, hrefsize);
 	mg_printf(de->conn,
-              "<tr><td><a href=\"%s%s\">%s%s</a></td>"
-              "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
-              href,
-              de->file.is_directory ? "/" : "",
-              de->file_name,
-              de->file.is_directory ? "/" : "",
-              mod,
-              size);
+	          "<tr><td><a href=\"%s%s\">%s%s</a></td>"
+	          "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
+	          href,
+	          de->file.is_directory ? "/" : "",
+	          de->file_name,
+	          de->file.is_directory ? "/" : "",
+	          mod,
+	          size);
 	mg_free(href);
 	return 0;
 }
@@ -9361,12 +9361,12 @@ handle_directory_request(struct mg_connection *conn, const char *dir)
 
 	/* Print first entry - link to a parent directory */
 	mg_printf(conn,
-              "<tr><td><a href=\"%s\">%s</a></td>"
-              "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
-              "..",
-              "Parent directory",
-              "-",
-              "-");
+	          "<tr><td><a href=\"%s\">%s</a></td>"
+	          "<td>&nbsp;%s</td><td>&nbsp;&nbsp;%s</td></tr>\n",
+	          "..",
+	          "Parent directory",
+	          "-",
+	          "-");
 
 	/* Sort and print directory entries */
 	if (data.entries != NULL) {
@@ -11204,8 +11204,7 @@ handle_cgi_request(struct mg_connection *conn, const char *prog)
 	    != NULL) {
 		conn->status_code = atoi(status);
 		status_text = status;
-		while (isdigit((unsigned char)*status_text)
-		       || *status_text == ' ') {
+		while (isdigit((unsigned char)*status_text) || *status_text == ' ') {
 			status_text++;
 		}
 	} else if (get_header(ri.http_headers, ri.num_headers, "Location")

src/main.c

@@ -739,8 +739,9 @@ read_config_file(const char *config_file, char **options)
 		}
 
 		/* Skip spaces, \r and \n at the end of the line */
-		for (j = strlen(p); (j > 0) && (isspace((unsigned char)p[j - 1])
-		                                || iscntrl((unsigned char)p[j - 1]));)
+		for (j = strlen(p); (j > 0)
+		                    && (isspace((unsigned char)p[j - 1])
+		                        || iscntrl((unsigned char)p[j - 1]));)
 			p[--j] = 0;
 
 		/* Find the space character between option name and value */