Merge branch 'sysprog21:master' into master

Author: yy214123

dudect/fixture.c

@@ -170,8 +170,11 @@ static bool test_const(char *text, int mode)
     return result;
 }
 
-#define DUT_FUNC_IMPL(op) \
-    bool is_##op##_const(void) { return test_const(#op, DUT(op)); }
+#define DUT_FUNC_IMPL(op)                \
+    bool is_##op##_const(void)           \
+    {                                    \
+        return test_const(#op, DUT(op)); \
+    }
 
 #define _(x) DUT_FUNC_IMPL(x)
 DUT_FUNCS

list.h

@@ -457,8 +457,8 @@ static inline void list_move_tail(struct list_head *node,
          &entry->member != (head); entry = safe,                       \
         safe = list_entry(safe->member.next, typeof(*entry), member))
 #else
-#define list_for_each_entry_safe(entry, safe, head, member)  \
-    for (entry = (void *) 1; sizeof(struct { int i : -1; }); \
+#define list_for_each_entry_safe(entry, safe, head, member)         \
+    for (entry = safe = (void *) 1; sizeof(struct { int i : -1; }); \
          ++(entry), ++(safe))
 #endif
 

qtest.c

@@ -434,7 +434,7 @@ static bool do_dedup(int argc, char *argv[])
 
     // Copy current->q to l_copy
     if (current->q && !list_empty(current->q)) {
-        list_for_each_entry (item, current->q, list) {
+        list_for_each_entry(item, current->q, list) {
             size_t slen;
             tmp = malloc(sizeof(element_t));
             if (!tmp)
@@ -451,7 +451,7 @@ static bool do_dedup(int argc, char *argv[])
         }
         // Return false if the loop does not leave properly
         if (&item->list != current->q) {
-            list_for_each_entry_safe (item, tmp, &l_copy, list) {
+            list_for_each_entry_safe(item, tmp, &l_copy, list) {
                 free(item->value);
                 free(item);
             }
@@ -468,7 +468,7 @@ static bool do_dedup(int argc, char *argv[])
     exception_cancel();
 
     if (!ok) {
-        list_for_each_entry_safe (item, tmp, &l_copy, list) {
+        list_for_each_entry_safe(item, tmp, &l_copy, list) {
             free(item->value);
             free(item);
         }
@@ -479,7 +479,7 @@ static bool do_dedup(int argc, char *argv[])
     struct list_head *l_tmp = current->q->next;
     bool is_this_dup = false;
     // Compare between new list and old one
-    list_for_each_entry (item, &l_copy, list) {
+    list_for_each_entry(item, &l_copy, list) {
         // Skip comparison with new list if the string is duplicate
         bool is_next_dup =
             item->list.next != &l_copy &&
@@ -503,7 +503,7 @@ static bool do_dedup(int argc, char *argv[])
                "ERROR: Duplicate strings are in queue or distinct strings are "
                "not in queue");
 
-    list_for_each_entry_safe (item, tmp, &l_copy, list) {
+    list_for_each_entry_safe(item, tmp, &l_copy, list) {
         free(item->value);
         free(item);
     }
@@ -544,7 +544,7 @@ static bool do_size(int argc, char *argv[])
     bool ok = true;
     if (argc == 2) {
         if (!get_int(argv[1], &reps))
-            report(1, "Invalid number of calls to size '%s'", argv[2]);
+            report(1, "Invalid number of calls to size '%s'", argv[1]);
     }
 
     int cnt = 0;
@@ -604,7 +604,7 @@ bool do_sort(int argc, char *argv[])
     unsigned no = 0;
     if (current && current->size && current->size <= MAX_NODES) {
         element_t *entry;
-        list_for_each_entry (entry, current->q, list)
+        list_for_each_entry(entry, current->q, list)
             nodes[no++] = &entry->list;
     } else if (current && current->size > MAX_NODES)
         report(1,

queue.h

@@ -201,13 +201,12 @@ void q_reverseK(struct list_head *head, int k);
 void q_sort(struct list_head *head, bool descend);
 
 /**
- * q_ascend() - Remove every node which has a node with a strictly less
+ * q_ascend() - Delete every node which has a node with a strictly less
  * value anywhere to the right side of it.
  * @head: header of queue
  *
  * No effect if queue is NULL or empty. If there has only one element, do
  * nothing.
- * Memory allocated to removed nodes must be freed.
  *
  * Reference:
  * https://leetcode.com/problems/remove-nodes-from-linked-list/
@@ -217,13 +216,12 @@ void q_sort(struct list_head *head, bool descend);
 int q_ascend(struct list_head *head);
 
 /**
- * q_descend() - Remove every node which has a node with a strictly greater
+ * q_descend() - Delete every node which has a node with a strictly greater
  * value anywhere to the right side of it.
  * @head: header of queue
  *
  * No effect if queue is NULL or empty. If there has only one element, do
  * nothing.
- * Memory allocated to removed nodes must be freed.
  *
  * Reference:
  * https://leetcode.com/problems/remove-nodes-from-linked-list/

scripts/checksums

@@ -1,3 +1,3 @@
-398b59c23f699ff1bf1e73a94503a9a91caa9207  queue.h
-5179cf8f5aafbc6cb8e8d7b898ef3798cfe85613  list.h
+bff0704601c8197ae6b847647b4167664b7d6abc  queue.h
+b26e079496803ebe318174bda5850d2cce1fd0c1  list.h
 1029c2784b4cae3909190c64f53a06cba12ea38e  scripts/check-commitlog.sh