From: Cristian Rodríguez <crrodriguez@opensuse.org>
Date: Sat, 21 Jan 2023 18:19:28 +0000 (+0000)
Subject: remove no longer needed braces
X-Git-Tag: v2.39-rc1~147
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7165c9bb1e5a68c9ead99f5d1cd186bf785ee4d5;p=thirdparty%2Futil-linux.git

remove no longer needed braces
---

diff --git a/libblkid/src/devno.c b/libblkid/src/devno.c
index d35c807da2..a1ab54362f 100644
--- a/libblkid/src/devno.c
+++ b/libblkid/src/devno.c
@@ -52,15 +52,12 @@ static char *blkid_strconcat(const char *a, const char *b, const char *c)
 	p = res = malloc(len + 1);
 	if (!res)
 		return NULL;
-	if (al) {
+	if (al)
 		p = mempcpy(p, a, al);
-	}
-	if (bl) {
+	if (bl)
 		p = mempcpy(p, b, bl);
-	}
-	if (cl) {
+	if (cl)
 		p = mempcpy(p, c, cl);
-	}
 	*p = '\0';
 	return res;
 }
diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c
index ef089a8ca3..32bc6feead 100644
--- a/misc-utils/blkid.c
+++ b/misc-utils/blkid.c
@@ -402,12 +402,11 @@ static int append_str(char **res, size_t *sz, const char *a, const char *b)
 	*res = str = xrealloc(str, len + 1);
 	str += *sz;
 
-	if (a) {
+	if (a)
 		str = mempcpy(str, a, asz);
-	}
-	if (b) {
+	if (b)
 		str = mempcpy(str, b, bsz);
-	}
+
 	*str = '\0';
 	*sz = len;
 	return 0;
diff --git a/term-utils/agetty.c b/term-utils/agetty.c
index d840475312..49935c8d95 100644
--- a/term-utils/agetty.c
+++ b/term-utils/agetty.c
@@ -616,14 +616,13 @@ static char *replace_u(char *str, char *username)
 		if (!tp)
 			log_err(_("failed to allocate memory: %m"));
 
-		if (p != str) {
+		if (p != str)
 			/* copy chars before \u */
 			tp = mempcpy(tp, str, p - str);
-		}
-		if (usz) {
+		if (usz)
 			/* copy username */
 			tp = mempcpy(tp, username, usz);
-		}
+
 		if (*(p + 2))
 			/* copy chars after \u + \0 */
 			memcpy(tp, p + 2, sz - (p - str) - 1);