From: ratchov <ratchov@openbsd.org>
Date: Wed, 10 Mar 2021 08:21:27 +0000 (+0000)
Subject: sndiod: Style tweak: swap if/else code blocks in slot_new()
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=b0bb1edf07f4bfc1b9fe2d3117c5614d6765ab2b;p=openbsd

sndiod: Style tweak: swap if/else code blocks in slot_new()
---

diff --git a/usr.bin/sndiod/dev.c b/usr.bin/sndiod/dev.c
index 8754bfb422c..e011882a64e 100644
--- a/usr.bin/sndiod/dev.c
+++ b/usr.bin/sndiod/dev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev.c,v 1.97 2021/03/08 09:42:50 ratchov Exp $	*/
+/*	$OpenBSD: dev.c,v 1.98 2021/03/10 08:21:27 ratchov Exp $	*/
 /*
  * Copyright (c) 2008-2012 Alexandre Ratchov <alex@caoua.org>
  *
@@ -1777,23 +1777,23 @@ slot_new(struct opt *opt, unsigned int id, char *who,
 			bestidx = i;
 		}
 	}
-	if (bestidx != DEV_NSLOT) {
-		s = slot_array + bestidx;
-		s->vol = MIDI_MAXCTL;
-		strlcpy(s->name, name, SLOT_NAMEMAX);
-		s->serial = slot_serial++;
-		for (i = 0; unit[i] != NULL; i++)
-			; /* nothing */
-		s->unit = i;
-		s->id = id;
-		goto found;
-	}
 
-	if (log_level >= 1) {
-		log_puts(name);
-		log_puts(": out of sub-device slots\n");
+	if (bestidx == DEV_NSLOT) {
+		if (log_level >= 1) {
+			log_puts(name);
+			log_puts(": out of sub-device slots\n");
+		}
+		return NULL;
 	}
-	return NULL;
+
+	s = slot_array + bestidx;
+	s->vol = MIDI_MAXCTL;
+	strlcpy(s->name, name, SLOT_NAMEMAX);
+	s->serial = slot_serial++;
+	for (i = 0; unit[i] != NULL; i++)
+		; /* nothing */
+	s->unit = i;
+	s->id = id;
 
 found:
 	if ((mode & MODE_REC) && (opt->mode & MODE_MON)) {