Merge branch 'sysprog21:master' into master

m561247 · Feb 28, 2024 · cdf6504 · cdf6504
2 parents bb73055 + 3aa0d55
commit cdf6504
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -76,7 +76,7 @@ $ make valgrind
 * Use `$ make clean` or `$ rm /tmp/qtest.*` to clean the temporary files created by target valgrind
 
 Extra options can be recognized by make:
-* `VERBOSE`: control the build verbosity. If `VERBOSE=1`, echo eacho command in build process.
+* `VERBOSE`: control the build verbosity. If `VERBOSE=1`, echo each command in build process.
 * `SANITIZER`: enable sanitizer(s) directed build. At the moment, AddressSanitizer is supported.
 
 ## Using `qtest`

diff --git a/queue.c b/queue.c
@@ -21,7 +21,7 @@ struct list_head *q_new()
 }
 
 /* Free all storage used by queue */
-void q_free(struct list_head *l) {}
+void q_free(struct list_head *head) {}
 
 /* Insert an element at head of queue */
 bool q_insert_head(struct list_head *head, char *s)

diff --git a/scripts/pre-commit.hook b/scripts/pre-commit.hook
@@ -16,7 +16,8 @@ CPPCHECK_suppresses="--inline-suppr harness.c \
 --suppress=nullPointer:qtest.c \
 --suppress=returnDanglingLifetime:report.c \
 --suppress=constParameterCallback:console.c \
---suppress=constParameterPointer:console.c"
+--suppress=constParameterPointer:console.c \
+--suppress=checkLevelNormal:log2_lshift16.h"
 CPPCHECK_OPTS="-I. --enable=all --error-exitcode=1 --force $CPPCHECK_suppresses $CPPCHECK_unmatched ."
 
 RETURN=0