Optimize code

Signed-off-by: Jianhui Zhao <[email protected]>

example/helloworld.c

@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <libubox/ulog.h>
 
 struct uwsc_client *gcl;
 struct uloop_fd fd;
@@ -78,18 +79,20 @@ static void usage(const char *prog)
         "      -u url       # ws://localhost:8080/ws\n"
         "      -c file      # Load CA certificates from file\n"
         "      -n           # don't validate the server's certificate\n"
+        "      -v           # verbose\n"
         , prog);
     exit(1);
 }
 
 int main(int argc, char **argv)
 {
     int opt;
-    static bool verify = true;
     const char *url = "ws://localhost:8080/ws";
     const char *crt_file = NULL;
+    bool verify = true;
+    bool verbose = false;
 
-    while ((opt = getopt(argc, argv, "u:nc:")) != -1) {
+    while ((opt = getopt(argc, argv, "u:nc:v")) != -1) {
         switch (opt)
         {
         case 'u':
@@ -101,11 +104,17 @@ int main(int argc, char **argv)
         case 'c':
             crt_file = optarg;
             break;
+        case 'v':
+            verbose = true;
+            break;
         default: /* '?' */
             usage(argv[0]);
         }
     }
 
+    if (!verbose)
+        ulog_threshold(LOG_ERR);
+
     uloop_init();
 
     gcl = uwsc_new_ssl(url, crt_file, verify);

src/CMakeLists.txt

@@ -32,7 +32,6 @@ install(
     FILES
 	    ${CMAKE_CURRENT_BINARY_DIR}/config.h
 	    ${CMAKE_CURRENT_SOURCE_DIR}/uwsc.h
-	    ${CMAKE_CURRENT_SOURCE_DIR}/log.h
     DESTINATION
     	include/uwsc
 )

src/log.c

@@ -14,13 +14,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-#include "log.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 #include <errno.h>
 
+#include "log.h"
+
 void __uwsc_log(const char *filename, int line, int priority, const char *fmt, ...)
 {
     va_list ap;

src/utils.c

@@ -1,6 +1,24 @@
+/*
+ * Copyright (C) 2017 Jianhui Zhao <[email protected]>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+
 #include "log.h"
 #include "utils.h"
 

src/utils.h

@@ -20,6 +20,7 @@
 
 #include <inttypes.h>
 #include <stdbool.h>
+
 #include "config.h"
 
 #if (UWSC_SSL_SUPPORT)