beautify code style

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
main
Jianhui Zhao 2020-03-13 23:09:48 +08:00
parent eb66e8e36f
commit 2ff3be7dc1
8 changed files with 21 additions and 21 deletions

View File

@ -54,9 +54,9 @@ static void signal_cb(struct ev_loop *loop, ev_signal *w, int revents)
static void usage(const char *prog) static void usage(const char *prog)
{ {
fprintf(stderr, "Usage: %s [option]\n" fprintf(stderr, "Usage: %s [option]\n"
" -p port # Default port is 8080\n" " -p port # Default port is 8080\n"
" -s # SSl on\n" " -s # SSl on\n"
" -v # verbose\n", prog); " -v # verbose\n", prog);
exit(1); exit(1);
} }
@ -71,11 +71,11 @@ int main(int argc, char **argv)
int opt; int opt;
while ((opt = getopt(argc, argv, "p:sv")) != -1) { while ((opt = getopt(argc, argv, "p:sv")) != -1) {
switch (opt) switch (opt) {
{
case 'p': case 'p':
port = atoi(optarg); port = atoi(optarg);
break;\ break;
\
case 's': case 's':
ssl = true; ssl = true;
case 'v': case 'v':
@ -88,7 +88,7 @@ int main(int argc, char **argv)
if (!verbose) if (!verbose)
uh_log_threshold(LOG_ERR); uh_log_threshold(LOG_ERR);
uh_log_info("libuhttpd version: %s\n", UHTTPD_VERSION_STRING); uh_log_info("libuhttpd version: %s\n", UHTTPD_VERSION_STRING);
srv = uh_server_new(loop, "0.0.0.0", port); srv = uh_server_new(loop, "0.0.0.0", port);
@ -112,7 +112,7 @@ int main(int argc, char **argv)
err: err:
srv->free(srv); srv->free(srv);
free(srv); free(srv);
return 0; return 0;
} }

@ -1 +1 @@
Subproject commit 99adb71b0bd8cb2c09fd41e52334a9bcf8831327 Subproject commit 2fb5523d44eb5cc65eb9473ecbf689727097b3cd

View File

@ -442,8 +442,8 @@ static void keepalive_cb(struct ev_loop *loop, struct ev_timer *w, int revents)
} }
if (after > 0) { if (after > 0) {
ev_timer_set (w, after, 0.0); ev_timer_set(w, after, 0.0);
ev_timer_start (loop, w); ev_timer_start(loop, w);
return; return;
} }

View File

@ -45,23 +45,23 @@ struct uh_request {
struct { struct {
int offset; int offset;
int len; int len;
}url_info; } url_info;
char *url; char *url;
struct { struct {
int name_offset; int name_offset;
int name_len; int name_len;
int value_offset; int value_offset;
int value_len; int value_len;
}headers_info[UHTTPD_MAX_HEADER_NUM]; } headers_info[UHTTPD_MAX_HEADER_NUM];
int header_num; int header_num;
struct { struct {
char *name; char *name;
char *value; char *value;
}headers[UHTTPD_MAX_HEADER_NUM]; } headers[UHTTPD_MAX_HEADER_NUM];
struct { struct {
int offset; int offset;
int len; int len;
}body; } body;
}; };
struct uh_connection { struct uh_connection {

View File

@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/ */
#ifndef _UH_LOG_H #ifndef _UH_LOG_H
#define _UH_LOG_H #define _UH_LOG_H

View File

@ -56,8 +56,8 @@ void *uh_ssl_ctx_init(const char *cert, const char *key)
goto err; goto err;
} }
if(mbedtls_ssl_config_defaults(&ctx->conf, MBEDTLS_SSL_IS_SERVER, if (mbedtls_ssl_config_defaults(&ctx->conf, MBEDTLS_SSL_IS_SERVER,
MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_PRESET_DEFAULT) != 0) { MBEDTLS_SSL_TRANSPORT_STREAM, MBEDTLS_SSL_PRESET_DEFAULT) != 0) {
uh_log_err("Failed to init SSL config\n"); uh_log_err("Failed to init SSL config\n");
goto err; goto err;
} }
@ -67,7 +67,7 @@ void *uh_ssl_ctx_init(const char *cert, const char *key)
#if defined(MBEDTLS_SSL_CACHE_C) #if defined(MBEDTLS_SSL_CACHE_C)
mbedtls_ssl_conf_session_cache(&ctx->conf, &ctx->cache, mbedtls_ssl_conf_session_cache(&ctx->conf, &ctx->cache,
mbedtls_ssl_cache_get, mbedtls_ssl_cache_set); mbedtls_ssl_cache_get, mbedtls_ssl_cache_set);
#endif #endif
mbedtls_ssl_conf_ca_chain(&ctx->conf, ctx->cert.next, NULL); mbedtls_ssl_conf_ca_chain(&ctx->conf, ctx->cert.next, NULL);

View File

@ -134,7 +134,7 @@ int uh_server_init(struct uh_server *srv, struct ev_loop *loop, const char *host
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int)); setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(int));
if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) <0) { if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) {
close(sock); close(sock);
uh_log_err("bind: %s\n", strerror(errno)); uh_log_err("bind: %s\n", strerror(errno));
return -1; return -1;

View File

@ -21,7 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE. * SOFTWARE.
*/ */
#ifndef _UH_UTILS_H #ifndef _UH_UTILS_H
#define _UH_UTILS_H #define _UH_UTILS_H