Message ID | 20181130130923.4678-3-zajec5@gmail.com |
---|---|
State | Accepted |
Delegated to: | Rafał Miłecki |
Headers | show
Return-Path: <openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ZZKwGDx7"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sfv2g+MR"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 435vrz5HBqz9sBQ for <incoming@patchwork.ozlabs.org>; Sat, 1 Dec 2018 00:10:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cvCupUKGfgJrIrWzc9KNfFsRIrFfRYvyYSlj71r73gw=; b=ZZKwGDx7TBG+NX FJejukGW+LK/JpR0nlu20Ppl1xMkb35/gPMQM8WyuaWpgh+ffWKexDwh/D0ARITogX7eWj1EHY5CW zO9OpsN8d9XDc7e/1nd45XWoQWoSwtikkSN4bqAWj4Y5CytIMjAxLNSmzcRdxZPDLBU6U7Ut8LZf0 mg8ERdZpGzd9QLBplSCVfyf19KZsJjaXaFX3+H/kR8ytVhAWIq2E+WjlLyVLeH2jlUHAF8pOnX+F6 u1BmqUyOHgKVl+qbAWHxM9mj6Fgz4qJpO9hovXDxhWS/zF516MalJGuFYzNRQK7NcjhtNWb4GtVcq YE8Dv/fGJt+/DrWz6pmA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSiZ0-000670-LT; Fri, 30 Nov 2018 13:10:34 +0000 Received: from mail-lf1-x141.google.com ([2a00:1450:4864:20::141]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gSiYK-000494-4R for openwrt-devel@lists.openwrt.org; Fri, 30 Nov 2018 13:09:57 +0000 Received: by mail-lf1-x141.google.com with SMTP id p6so4077421lfc.1 for <openwrt-devel@lists.openwrt.org>; Fri, 30 Nov 2018 05:09:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9yVhXjjb5+V1JKukTWBueKrjVg1ZYVWbAHhEtxPDXZc=; b=sfv2g+MRYgavAT71TVATdVPLhB2WVRFiVEe1bv5x49v057i0jb+ZKsc5zbv4I0ya6j avgrbieJ2mC3+IhQZWsGr1nOPFAUf+ZiOsjtL6GvJ4EqzDdrgc7gRWrKfoG/ohJX0oSZ UciuyL7cqUjAktpiAa/RSHRMa+4Q8JC3+XzTSHcm7Rpuint9PTq41U2pkrBRfwCpigaG MI0TXI2KgVvVYWiCp26ASpGiXEbjp4MpkYWWkJ4ewflIkTt3gGi5gUQHf4T63he+AzlP bVFqwEpQprMSuvUJGalYm757cnF8TpPnXlSSq0gMFZZS083/WILBvIiQF3z8ngNQBziX ZZXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9yVhXjjb5+V1JKukTWBueKrjVg1ZYVWbAHhEtxPDXZc=; b=frbuhdDL6p988WG2hng6w1f7Yz3fPDe8o+nbP0KUP/oCy0KskDMEn+bwQyLDnh4NAl vES+9oB/Qom867zg6ofIq32aavF/F6gTZVAGGtJlT+N69mi3Sc0CgASZre82NWT6jR5i TY9n4ytgaQNHExvrIYFGWWJP2wyfb7uWxyMQTxQNrQ908R9KKGNNsfaQLaJTzem8S1SG MSBnt57rQY6FZsehCvNohTFmszE66Zqp5TBbEeutmHPK3otVrmiUChI7eWSjWouiBLMc unUDdwUNEC9OUGFtFpkLwJniucCr15DJ2PNdObiX+SByWQE+tfgRflIdRMvQI45JJvOp a3ug== X-Gm-Message-State: AA+aEWbvIPXWcIz/JvKGgCKIHkl0jKflESacDGxl8UJW4tNJnic4ELeh Wcg2iSkiCjcN9rWs9SGorGxUiHwa X-Google-Smtp-Source: AFSGD/VS4nWlynHRMvCivfECK+LwYvwx//oyK8QYEeSYxA4iSl0cR/+VG8Zt02Twlbt4WtGeX0f5Bw== X-Received: by 2002:a19:6a13:: with SMTP id u19mr3468344lfu.46.1543583379882; Fri, 30 Nov 2018 05:09:39 -0800 (PST) Received: from linux-veee.lan (ip-194-187-74-233.konfederacka.maverick.com.pl. [194.187.74.233]) by smtp.gmail.com with ESMTPSA id w12sm798642lfe.80.2018.11.30.05.09.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Nov 2018 05:09:39 -0800 (PST) From: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= <zajec5@gmail.com> To: openwrt-devel@lists.openwrt.org Date: Fri, 30 Nov 2018 14:09:22 +0100 Message-Id: <20181130130923.4678-3-zajec5@gmail.com> X-Mailer: git-send-email 2.13.7 In-Reply-To: <20181130130923.4678-1-zajec5@gmail.com> References: <20181130130923.4678-1-zajec5@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181130_050952_167560_AE569313 X-CRM114-Status: GOOD ( 11.49 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:141 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (zajec5[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (zajec5[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain Subject: [OpenWrt-Devel] [PATCH fstools 3/4] block: simplify code picking mount target directory X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <openwrt-devel.lists.openwrt.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/openwrt-devel/> List-Post: <mailto:openwrt-devel@lists.openwrt.org> List-Help: <mailto:openwrt-devel-request@lists.openwrt.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/openwrt-devel>, <mailto:openwrt-devel-request@lists.openwrt.org?subject=subscribe> Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= <rafal@milecki.pl> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "openwrt-devel" <openwrt-devel-bounces@lists.openwrt.org> Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org |
Series |
[OpenWrt-Devel,fstools,1/4] block: fix formatting & indent in the mount_device()
|
expand
|
diff --git a/block.c b/block.c index f42d0d6..0671aca 100644 --- a/block.c +++ b/block.c @@ -1025,8 +1025,8 @@ static int mount_device(struct probe_info *pr, int type) blockd_notify(device, m, pr); if (m) { - char *target = m->target; char _target[32]; + char *target; int err = 0; switch (type) { @@ -1049,8 +1049,9 @@ static int mount_device(struct probe_info *pr, int type) if (m->autofs) { snprintf(_target, sizeof(_target), "/tmp/run/blockd/%s", device); target = _target; - } - if (!target) { + } else if (m->target) { + target = m->target; + } else { snprintf(_target, sizeof(_target), "/mnt/%s", device); target = _target; }