Commit Diff

Commit:
b15f45f4606f3d64aa30dac5a61c622a9b88ce09
From:
Mark Jamsek <mark@jamsek.dev>
Via:
Thomas Adam <thomas@xteddy.org>
Date:
Message:
sync files from diff.git 35eae7fa6b782ae1d000183ef2efc4383dfec4cd This removes the gcc ternary if extension (includes follow-up diff.git fix for missing '\' in wrapped macro 7a38b3a33f8b124c9c01da154dfdf711d328b01d)
Actions:
Patch | Tree
commit - f530ab0e9647e91457d9f44afe8be17788bf1e8a
commit + b15f45f4606f3d64aa30dac5a61c622a9b88ce09
blob - 45fff0814875e571893213a65e3e72727d12a116
blob + 67556e183e3eacff6c547b74dcaca2f487254e04
--- lib/arraylist.h
+++ lib/arraylist.h
@@ -68,7 +68,8 @@
 				(ARRAY_LIST).allocated + \
 				((ARRAY_LIST).allocated ? \
 				(ARRAY_LIST).allocated / 2 : \
-				(ARRAY_LIST).alloc_blocksize ? : 8), \
+				(ARRAY_LIST).alloc_blocksize ? \
+				(ARRAY_LIST).alloc_blocksize : 8), \
 				sizeof(*(ARRAY_LIST).head)); \
 			if ((ARRAY_LIST).p == NULL) { \
 				NEW_ITEM_P = NULL; \
@@ -77,7 +78,8 @@
 			(ARRAY_LIST).allocated += \
 				(ARRAY_LIST).allocated ? \
 				(ARRAY_LIST).allocated / 2 : \
-				(ARRAY_LIST).alloc_blocksize ? : 8, \
+				(ARRAY_LIST).alloc_blocksize ? \
+				(ARRAY_LIST).alloc_blocksize : 8, \
 			(ARRAY_LIST).head = (ARRAY_LIST).p; \
 			(ARRAY_LIST).p = NULL; \
 		}; \
blob - 7b585c9148badc2c5ae6935a278d6ce4bcf8a5d0
blob + 8ec82aa3609a66cba646d6eed48f4c3e7607235a
--- lib/diff_main.c
+++ lib/diff_main.c
@@ -604,7 +604,8 @@ diff_main(const struct diff_config *config, struct dif
 
 	struct diff_state state = {
 		.result = result,
-		.recursion_depth_left = config->max_recursion_depth ? : UINT_MAX,
+		.recursion_depth_left = config->max_recursion_depth ?
+		    config->max_recursion_depth : UINT_MAX,
 		.kd_buf = NULL,
 		.kd_buf_size = 0,
 	};
blob - f9f748fd298e5716a0fbfa2a0ff0277abc7a331e
blob + 3047221aa5a15e4fc2a5dea8267e97864da21264
--- lib/diff_output.c
+++ lib/diff_output.c
@@ -365,7 +365,7 @@ diff_output_get_label_left(const struct diff_input_inf
 	if (info->flags & DIFF_INPUT_LEFT_NONEXISTENT)
 		return "/dev/null";
 
-	return info->left_path ? : "a";
+	return info->left_path ? info->left_path : "a";
 }
 
 const char *
@@ -374,5 +374,5 @@ diff_output_get_label_right(const struct diff_input_in
 	if (info->flags & DIFF_INPUT_RIGHT_NONEXISTENT)
 		return "/dev/null";
 
-	return info->right_path ? : "b";
+	return info->right_path ? info->right_path : "b";
 }