aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-12-16 08:50:46 +0100
committerDaniel Stenberg <daniel@haxx.se>2019-12-17 07:36:11 +0100
commitbdb5b6dd5b91a7960b778a2a6e76af028fc5596a (patch)
tree29167228f4c816c0b1d80e42fa44f1d77b5b4269 /lib
parent7282093458628b1040e76ff5cb6b9a53dc6afdd7 (diff)
lib: remove ASSIGNWITHINCONDITION exceptions, use our code style
... even for macros Reviewed-by: Daniel Gustafsson Reviewed-by: Jay Satiro Reported-by: Jay Satiro Fixes #4683 Closes #4722
Diffstat (limited to 'lib')
-rw-r--r--lib/curl_multibyte.h9
-rw-r--r--lib/vssh/libssh.c10
2 files changed, 14 insertions, 5 deletions
diff --git a/lib/curl_multibyte.h b/lib/curl_multibyte.h
index 5225e1811..3becf41cf 100644
--- a/lib/curl_multibyte.h
+++ b/lib/curl_multibyte.h
@@ -61,8 +61,13 @@ char *Curl_convert_wchar_to_UTF8(const wchar_t *str_w);
#define Curl_convert_UTF8_to_tchar(ptr) Curl_convert_UTF8_to_wchar((ptr))
#define Curl_convert_tchar_to_UTF8(ptr) Curl_convert_wchar_to_UTF8((ptr))
-#define Curl_unicodefree(ptr) \
- do {if((ptr)) {free((ptr)); (ptr) = NULL;}} while(0)
+#define Curl_unicodefree(ptr) \
+ do { \
+ if(ptr) { \
+ free(ptr); \
+ (ptr) = NULL; \
+ } \
+ } while(0)
typedef union {
unsigned short *tchar_ptr;
diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c
index cad8b3786..62a7f1960 100644
--- a/lib/vssh/libssh.c
+++ b/lib/vssh/libssh.c
@@ -97,9 +97,13 @@
/* A recent macro provided by libssh. Or make our own. */
#ifndef SSH_STRING_FREE_CHAR
-/* !checksrc! disable ASSIGNWITHINCONDITION 1 */
-#define SSH_STRING_FREE_CHAR(x) \
- do { if((x) != NULL) { ssh_string_free_char(x); x = NULL; } } while(0)
+#define SSH_STRING_FREE_CHAR(x) \
+ do { \
+ if(x) { \
+ ssh_string_free_char(x); \
+ x = NULL; \
+ } \
+ } while(0)
#endif
/* Local functions: */