Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ba8444a06623b4f9af051aec47247c202937ec00

Authored by Simon Glass
1 parent 88b3a37eaa
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

test: Add underscore prefix to macro parameters 

If a test happens to use the same variable as the macro parameter the
macro does not work as intended. Add an underscore to guard against this.

Signed-off-by: Simon Glass <sjg@chromium.org>

Showing 1 changed file with 22 additions and 22 deletions Side-by-side Diff

... ... @@ -56,39 +56,39 @@
56 56  
57 57 /* Assert that two int expressions are equal */
58 58 #define ut_asserteq(expr1, expr2) { \
59   - unsigned int val1 = (expr1), val2 = (expr2); \
  59 + unsigned int _val1 = (expr1), _val2 = (expr2); \
60 60 \
61   - if (val1 != val2) { \
  61 + if (_val1 != _val2) { \
62 62 ut_failf(uts, __FILE__, __LINE__, __func__, \
63 63 #expr1 " == " #expr2, \
64   - "Expected %#x (%d), got %#x (%d)", val1, val1, \
65   - val2, val2); \
  64 + "Expected %#x (%d), got %#x (%d)", \
  65 + _val1, _val1, _val2, _val2); \
66 66 return CMD_RET_FAILURE; \
67 67 } \
68 68 }
69 69  
70 70 /* Assert that two string expressions are equal */
71 71 #define ut_asserteq_str(expr1, expr2) { \
72   - const char *val1 = (expr1), *val2 = (expr2); \
  72 + const char *_val1 = (expr1), *_val2 = (expr2); \
73 73 \
74   - if (strcmp(val1, val2)) { \
  74 + if (strcmp(_val1, _val2)) { \
75 75 ut_failf(uts, __FILE__, __LINE__, __func__, \
76 76 #expr1 " = " #expr2, \
77   - "Expected \"%s\", got \"%s\"", val1, val2); \
  77 + "Expected \"%s\", got \"%s\"", _val1, _val2); \
78 78 return CMD_RET_FAILURE; \
79 79 } \
80 80 }
81 81  
82 82 /* Assert that two memory areas are equal */
83 83 #define ut_asserteq_mem(expr1, expr2, len) { \
84   - const u8 *val1 = (u8 *)(expr1), *val2 = (u8 *)(expr2); \
  84 + const u8 *_val1 = (u8 *)(expr1), *_val2 = (u8 *)(expr2); \
85 85 const uint __len = len; \
86 86 \
87   - if (memcmp(val1, val2, __len)) { \
  87 + if (memcmp(_val1, _val2, __len)) { \
88 88 char __buf1[64 + 1] = "\0"; \
89 89 char __buf2[64 + 1] = "\0"; \
90   - bin2hex(__buf1, val1, min(__len, (uint)32)); \
91   - bin2hex(__buf2, val2, min(__len, (uint)32)); \
  90 + bin2hex(__buf1, _val1, min(__len, (uint)32)); \
  91 + bin2hex(__buf2, _val2, min(__len, (uint)32)); \
92 92 ut_failf(uts, __FILE__, __LINE__, __func__, \
93 93 #expr1 " = " #expr2, \
94 94 "Expected \"%s\", got \"%s\"", \
95 95  
96 96  
97 97  
98 98  
99 99  
100 100  
101 101  
... ... @@ -99,33 +99,33 @@
99 99  
100 100 /* Assert that two pointers are equal */
101 101 #define ut_asserteq_ptr(expr1, expr2) { \
102   - const void *val1 = (expr1), *val2 = (expr2); \
  102 + const void *_val1 = (expr1), *_val2 = (expr2); \
103 103 \
104   - if (val1 != val2) { \
  104 + if (_val1 != _val2) { \
105 105 ut_failf(uts, __FILE__, __LINE__, __func__, \
106 106 #expr1 " = " #expr2, \
107   - "Expected %p, got %p", val1, val2); \
  107 + "Expected %p, got %p", _val1, _val2); \
108 108 return CMD_RET_FAILURE; \
109 109 } \
110 110 }
111 111  
112 112 /* Assert that a pointer is NULL */
113 113 #define ut_assertnull(expr) { \
114   - const void *val = (expr); \
  114 + const void *_val = (expr); \
115 115 \
116   - if (val != NULL) { \
  116 + if (_val) { \
117 117 ut_failf(uts, __FILE__, __LINE__, __func__, \
118 118 #expr " != NULL", \
119   - "Expected NULL, got %p", val); \
  119 + "Expected NULL, got %p", _val); \
120 120 return CMD_RET_FAILURE; \
121 121 } \
122 122 }
123 123  
124 124 /* Assert that a pointer is not NULL */
125 125 #define ut_assertnonnull(expr) { \
126   - const void *val = (expr); \
  126 + const void *_val = (expr); \
127 127 \
128   - if (val == NULL) { \
  128 + if (!_val) { \
129 129 ut_failf(uts, __FILE__, __LINE__, __func__, \
130 130 #expr " = NULL", \
131 131 "Expected non-null, got NULL"); \
132 132  
133 133  
... ... @@ -135,13 +135,13 @@
135 135  
136 136 /* Assert that a pointer is not an error pointer */
137 137 #define ut_assertok_ptr(expr) { \
138   - const void *val = (expr); \
  138 + const void *_val = (expr); \
139 139 \
140   - if (IS_ERR(val)) { \
  140 + if (IS_ERR(_val)) { \
141 141 ut_failf(uts, __FILE__, __LINE__, __func__, \
142 142 #expr " = NULL", \
143 143 "Expected pointer, got error %ld", \
144   - PTR_ERR(val)); \
  144 + PTR_ERR(_val)); \
145 145 return CMD_RET_FAILURE; \
146 146 } \
147 147 }