Browse Source

Merge branch 'wangyu-:unified' into unified

gek64 2 years ago
parent
commit
ca16c3a5e6
3 changed files with 9 additions and 9 deletions
  1. 1 1
      CMakeLists.txt
  2. 4 4
      common.cpp
  3. 4 4
      main.cpp

+ 1 - 1
CMakeLists.txt

@@ -1,5 +1,5 @@
 #note: experimental
-#      currently only used for generating `compile_commands.json` for clangd
+#      currently only used for generating `compile_commands.json` for clangd.
 #      to build this project, it's suggested to use `makefile` instead
 
 cmake_minimum_required(VERSION 3.7)

+ 4 - 4
common.cpp

@@ -1127,8 +1127,8 @@ void print_binary_chars(const char *a, int len) {
 u32_t djb2(unsigned char *str, int len) {
     u32_t hash = 5381;
     int c;
-    int i = 0;
-    while (c = *str++, i++ != len) {
+    for (int i=0; i<len ;i++) {
+        c = *(str++);
         hash = ((hash << 5) + hash) ^ c; /* (hash * 33) ^ c */
     }
 
@@ -1139,8 +1139,8 @@ u32_t djb2(unsigned char *str, int len) {
 u32_t sdbm(unsigned char *str, int len) {
     u32_t hash = 0;
     int c;
-    int i = 0;
-    while (c = *str++, i++ != len) {
+    for (int i=0; i<len ;i++) {
+        c = *(str++);
         hash = c + (hash << 6) + (hash << 16) - hash;
     }
     // hash=htonl(hash);

+ 4 - 4
main.cpp

@@ -40,19 +40,19 @@ int main(int argc, char *argv[]) {
 
     pre_process_arg(argc, argv);
 
+    ev_signal signal_watcher_sigpipe;
+    ev_signal signal_watcher_sigterm;
+    ev_signal signal_watcher_sigint;
+
     if (program_mode == client_mode) {
         struct ev_loop *loop = ev_default_loop(0);
 #if !defined(__MINGW32__)
-        ev_signal signal_watcher_sigpipe;
         ev_signal_init(&signal_watcher_sigpipe, sigpipe_cb, SIGPIPE);
         ev_signal_start(loop, &signal_watcher_sigpipe);
 #endif
-
-        ev_signal signal_watcher_sigterm;
         ev_signal_init(&signal_watcher_sigterm, sigterm_cb, SIGTERM);
         ev_signal_start(loop, &signal_watcher_sigterm);
 
-        ev_signal signal_watcher_sigint;
         ev_signal_init(&signal_watcher_sigint, sigint_cb, SIGINT);
         ev_signal_start(loop, &signal_watcher_sigint);
     } else {