Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp772037pxj; Thu, 3 Jun 2021 20:14:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGhte4uM7dopWgsEnqyjPiiDDcXE9cVviIIZNqx1UHerzcHxWgPh2KCiYeFjYWM25PwzEE X-Received: by 2002:a50:ff0a:: with SMTP id a10mr2436475edu.273.1622776448503; Thu, 03 Jun 2021 20:14:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622776448; cv=none; d=google.com; s=arc-20160816; b=jh9MMmPlKwUy2tPlgrIuloKHXdzgKLixk/Yf2w/S72AMkq6FxPk8LTXb6Suy7f3s8r t2OhuAKj0uElt3+hWam3C2xjYUE5AoLz1FdCQaNZnAExYOwCVhDJo3HvbncrjwnELdpA f3YN/YRU+jwdnjiYZS7Ysh1QT7Q2HkNbnX3b+rWEtDnUKZ6hOTXaZRE2DpXz3OE3+7jf fvPuJz31pNp6vY9zZ5OCUQRJq2xljPFQ5wRdI1DleGKT/doHgL7LT1aOjCU2s/q8X9Aw BkxExKdxly10rFdxDa5sKaLV5yvAK2NA2c9raljfotAUBq7mQCWYaW8d5K09pm+LjNcM OZuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=dlryyWVlvsjGjPmlZr4wasN+rfckYtap12Y9GmU8CGs=; b=V6Zfn9mpoLu0vBYxGaEsmj5S7Nau8DpAPsBw0j4Uz3xaoA4aAKKF3Gx+Tt6VbFb9pD Y+HvQPc4Jhi67aIcKMEYv/uRXq7x6O+Kjb0IdxwfQhA1tx3llenQ3NjaZcdwTnaq4pJ7 ZQkCNLvvbW2aKj+WG6jHt1R2jKayMk34x2z9/irMU3KDw1/S4gOSnaSViup2UycWmdEw MNDWNLTrhdzgNCZGW/1Z0hMh2fnlyd75Y6uT9xetFAlzacGH+sRFnECoZpnE4V3CdLhB 4TY+bmdDH2lOuf2/fOIZtTcO32kDAHIlKU6ZmJsLF5J6DpcaaOskW7JSRnuXBaafg5xL 2nMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=PTR8z67k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m5si3517951edr.557.2021.06.03.20.13.46; Thu, 03 Jun 2021 20:14:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@163.com header.s=s110527 header.b=PTR8z67k; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=163.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229810AbhFDDNu (ORCPT + 99 others); Thu, 3 Jun 2021 23:13:50 -0400 Received: from m12-18.163.com ([220.181.12.18]:44072 "EHLO m12-18.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229704AbhFDDNt (ORCPT ); Thu, 3 Jun 2021 23:13:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=dlryy WVlvsjGjPmlZr4wasN+rfckYtap12Y9GmU8CGs=; b=PTR8z67k94NKz21p3dS3S N5FMo4TMqQ6ixiPpM7ZOpGDEFtfsFTjhniJXSRp1HCpNS3ULF4jQTTB3Gqb6iNVT Oy5ML1+TCauoMvUDAWhd3zkG12nW+QZPUucytlv67+ty2fNdzyz9X20tXYN2ev6b uRv8Hyc/zAfSnofc4sUV0A= Received: from ubuntu.localdomain (unknown [218.17.89.92]) by smtp14 (Coremail) with SMTP id EsCowABHSOABmrlgy+V3nQ--.55924S2; Fri, 04 Jun 2021 11:12:02 +0800 (CST) From: 13145886936@163.com To: linux-kernel@vger.kernel.org Cc: gushengxian Subject: [PATCH] gen_init_cpio: Revised the use of space and tabs Date: Thu, 3 Jun 2021 20:11:59 -0700 Message-Id: <20210604031159.11234-1-13145886936@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID: EsCowABHSOABmrlgy+V3nQ--.55924S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxurWkurWfXF15GF1rAry3CFg_yoW5Gw4xpF Z0qr1jvr43Xay3CanxWr18Zrn8XryDKw13uFWvq348ZFsxX34rKw4UJw17Ka4Fkr13Za45 Zay3KF4DKw4UJaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07b1CJQUUUUU= X-Originating-IP: [218.17.89.92] X-CM-SenderInfo: 5zrdx5xxdq6xppld0qqrwthudrp/xtbBzgWng1QHMxhcugABsw Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: gushengxian Revised the use of space and tabs. Signed-off-by: gushengxian --- usr/gen_init_cpio.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/usr/gen_init_cpio.c b/usr/gen_init_cpio.c index 03b21189d58b..6c28a0938a5e 100644 --- a/usr/gen_init_cpio.c +++ b/usr/gen_init_cpio.c @@ -107,7 +107,7 @@ static int cpio_mkslink(const char *name, const char *target, if (name[0] == '/') name++; - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" + sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" "%08X%08X%08X%08X%08X%08X%08X", "070701", /* magic */ ino++, /* ino */ @@ -156,7 +156,7 @@ static int cpio_mkgeneric(const char *name, unsigned int mode, if (name[0] == '/') name++; - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" + sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" "%08X%08X%08X%08X%08X%08X%08X", "070701", /* magic */ ino++, /* ino */ @@ -250,7 +250,7 @@ static int cpio_mknod(const char *name, unsigned int mode, if (name[0] == '/') name++; - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" + sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" "%08X%08X%08X%08X%08X%08X%08X", "070701", /* magic */ ino++, /* ino */ @@ -335,12 +335,13 @@ static int cpio_mkfile(const char *name, const char *location, size = 0; for (i = 1; i <= nlinks; i++) { /* data goes on last link */ - if (i == nlinks) size = buf.st_size; + if (i == nlinks) + size = buf.st_size; if (name[0] == '/') name++; namesize = strlen(name) + 1; - sprintf(s,"%s%08X%08X%08lX%08lX%08X%08lX" + sprintf(s, "%s%08X%08X%08lX%08lX%08X%08lX" "%08lX%08X%08X%08X%08X%08X%08X", "070701", /* magic */ ino, /* ino */ @@ -373,10 +374,12 @@ static int cpio_mkfile(const char *name, const char *location, } ino++; rc = 0; - + error: - if (filebuf) free(filebuf); - if (file >= 0) close(file); + if (filebuf) + free(filebuf); + if (file >= 0) + close(file); return rc; } @@ -443,9 +446,10 @@ static int cpio_mkfile_line(const char *line) dname = name; } rc = cpio_mkfile(dname, cpio_replace_env(location), - mode, uid, gid, nlinks); + mode, uid, gid, nlinks); fail: - if (dname_len) free(dname); + if (dname_len) + free(dname); return rc; } @@ -603,7 +607,7 @@ int main (int argc, char *argv[]) for (type_idx = 0; file_handler_table[type_idx].type; type_idx++) { int rc; - if (! strcmp(line, file_handler_table[type_idx].type)) { + if (!strcmp(line, file_handler_table[type_idx].type)) { if ((rc = file_handler_table[type_idx].handler(args))) { ec = rc; fprintf(stderr, " line %d\n", line_nr); -- 2.25.1