From patchwork Mon Jul 26 15:15:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Storm, Christian" X-Patchwork-Id: 1510106 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::139; helo=mail-lf1-x139.google.com; envelope-from=swupdate+bncbdd6bwv65qpbbcvc7odqmgqe5xolkaq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=OhroM1Mj; dkim-atps=neutral Received: from mail-lf1-x139.google.com (mail-lf1-x139.google.com [IPv6:2a00:1450:4864:20::139]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GYNjD1HkDz9ssD for ; Tue, 27 Jul 2021 01:13:19 +1000 (AEST) Received: by mail-lf1-x139.google.com with SMTP id e22-20020a1969160000b029037107a2a7aesf4355150lfc.6 for ; Mon, 26 Jul 2021 08:13:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627312394; cv=pass; d=google.com; s=arc-20160816; b=rgGt3T5DDMOQ957IlsiTzk9GsNNaxJQ/EX/j+PB2tnvwQyoamxR88w7ASATMxDo8vs Dt2N4KuZz7XIRUfVG81R/0tRx8XsZiVN72mAbbZNydPhoITDlegI2UzBDvVJf/hNZfv3 KX0vBy7VZmn9wuc6dR6EMfFez0NqG3tmC8uye4wzgY2a2orBKfF3eUkNv4ORwoboa0tr GmkbASlTv6bqgYGxe+CXUGxd7dk83PaUTVxyeViJh/QKs+NZ0a7ZDeRoV4slfoW/vN7q 3j2oMK/ZI2yN9rjZ3fBnQ6qzqOlhrYO8zft6bz2A/z7JX55yxlv7mWLhuShxpQsLIqD5 sApQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=Qs+aF17kNgahNLD3lpcniHNUc7He9dFcqbCuhEV4BH0=; b=y2OFBoBJkvxIn0PA6dPTB0fa3k3ECi/NNtirTCNXf7npHyR1DkcEQ+32iTMXwFNpGO frqj1CM3fuTRTMzdYEZkG/lXdAv11tqok0C6l0idoGMsOmic5AxpYH1yfGunDFryuafj oat77YvhL6R61JZnA0r6elsTfoUy7cGUmVehJtTzNBqljKVJhW6c3N1B9W1zibX7Lm60 DebCqIJyAmRoU/lUC1pfU23qQ7C4sQJtukvepKS7dzQPosmvCi/JOxyDPi3EamMqxP4B 2IlPM4P5aWLYCNxynHOymWUrS/sgfzyxKRq39pGDxD3J96HcCbSC453vEKgSzkFcHeLl sNqw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Qs+aF17kNgahNLD3lpcniHNUc7He9dFcqbCuhEV4BH0=; b=OhroM1MjY/O+PV+Ux7oeFJ9XFIbRtJmkFysj0HTgjDkyCN4pA36eJVNSll2eGG68AG /4zFx1B43i6t4IXramLMfFAMMj2J1YzdXMmto9qhV0Tdxn+AV6t628SKt45icoPnF5UE Z5/Ve9l1AQszp4ZRCOWnWOKwEsHHIjr8GOrrKIrUj/+h9JIoo1s/lRHsQbqGF11S/HCz UxXdRrbRjAdb0jvNeWvZfb8i3biqJT/TmgOKDbQO8zlxQi4rSiQV9eIHw9GQvYM2yG5R xPtEleojE5BmSilvPk8To2ZKL5du1gcRSgY4TcfiVOAady//dIWSjTIyiFKzVwpSTNh4 xdHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=Qs+aF17kNgahNLD3lpcniHNUc7He9dFcqbCuhEV4BH0=; b=hcHug72o8Lm9T465G2Q8LHO5FMcLcOZt78T7Q/o0b8kK6cJyvRzpN+azAjOUAuq1/v MkdshGpdW6AtltdpDk+RTFE+Wq+TYUjFG2/YCEyO7aRtkKLZq0MV3FixderLNEh0Fs9O xXx7B5hr4Ze3DhLTBUomv9oAtED7fn+srK7YaI195aAfZpNGS5pFDji4Ot0cy1UOAP7x TaP9fGUrTn32kVjDUWzUr2se1jI4ZLpqslmpD6p/4c5KDOFGiGd14FPdksOpcONl+8qZ XLu4qBHGigtpsbyBSnjzexK54VjLlFWDD7a6p2y4qmQ3ipDi2qsIDqHHCs9/VYj4rwfh br7w== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM5320Q9q2HPkvUgAAUQatkUpzmicMe1HV0PxFX7c52DdlFqUQpvR5 yq4+BNYq0HnciFOJ3Limakw= X-Google-Smtp-Source: ABdhPJx9uLw3lbPAl4VJBgCvcTZnJvhmpwa9j0go4XdTH6CbZ3jz00C/FEr+lC6jS21z3rDuPd9vXg== X-Received: by 2002:a2e:545d:: with SMTP id y29mr12474651ljd.469.1627312394411; Mon, 26 Jul 2021 08:13:14 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:b171:: with SMTP id a17ls2756979ljm.4.gmail; Mon, 26 Jul 2021 08:13:13 -0700 (PDT) X-Received: by 2002:a05:651c:1611:: with SMTP id f17mr12863576ljq.491.1627312393297; Mon, 26 Jul 2021 08:13:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627312393; cv=none; d=google.com; s=arc-20160816; b=Uij5rNH/sHAumYCjAI2S8I/2Pbvos7hxyGpPJDcxaYSkBSsbkzmRzRSHTZVPMVpMTg gkb3EJvj/U7l1EheoYmF2YFq6e9N/V7NwlOJhwA/JhrQprgmhQ9PQ7cA+w75t+hCVLs3 3xb+brrUTb3TYdWulJhYvGST8SPrU1S7EJTAuxv8HguYhPXJFyKH483Nqez7AEJJwKSs lpsJfp7oMEXd8+2fcd/4cUPLyTYf+wEEYBPNoSji+Ru/yqxIFBQL12Pl3VxCxAvdzvuH VIvHZSBVfvaWeArDoGzyTQg8ehUs9gaXtgHOQ9FVwSEZH0PpmsgJXcyuSNXd4Zc2243d GWYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=XMyxHEVCJLtVIKz5ixuYXFwBt25AXIAHH+aR+0LpbwE=; b=ageWsf8xk5jPdUjyOB7ZiCOcUqRmD5dZJ7rHPWJXBrdlAgyuj3jc5xaR6fxdtp7Ze2 NJfj0ohZ1dWSeexXQn4fLnyb7S6x+PKRR9BE154wU/IixGCS+RbnKYgJTIl99BHRGe6m +FH/yOCUQgrmSoxp4AOTceBz1gjjziYyFvsFVJnxPBXWveNrOvEaQveedQlZl/XNiy5u PbrvseKCcfzef35EBmL/anyPdDgOFgfQTJuCtDGyjCDzsWYm3XmIjaob+eOhlu5gBdpr iAEYciB4Ct1+PG0u7VAOuvL5eCu0HXIWuKGSamUcLvI0hdyFZpFxoU49JyEAXBMtpGL1 72pQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id d8si8209lfa.6.2021.07.26.08.13.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Jul 2021 08:13:13 -0700 (PDT) Received-SPF: pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Received: from mail2.siemens.de (mail2.siemens.de [139.25.208.11]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 16QFDCrR006052 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 26 Jul 2021 17:13:12 +0200 Received: from MD1ZFJVC.ad001.siemens.net ([167.87.36.213]) by mail2.siemens.de (8.15.2/8.15.2) with ESMTP id 16QFDCqQ025134; Mon, 26 Jul 2021 17:13:12 +0200 From: Christian Storm To: swupdate@googlegroups.com Cc: Christian Storm Subject: [swupdate] [PATCH] utils: Fix string_split() formatting Date: Mon, 26 Jul 2021 17:15:11 +0200 Message-Id: <20210726151511.61733-1-christian.storm@siemens.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-Original-Sender: christian.storm@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of christian.storm@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=christian.storm@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Sanitize formatting of the string_split() function. Signed-off-by: Christian Storm --- core/util.c | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/core/util.c b/core/util.c index d4ff940..342c890 100644 --- a/core/util.c +++ b/core/util.c @@ -608,26 +608,24 @@ int set_aes_ivt(const char *ivt) char** string_split(const char* in, const char d) { - char** result = 0; - size_t count = 0; + char** result = 0; + size_t count = 0; char* last_delim = 0; char delim[2]; delim[0] = d; delim[1] = 0; char *s = strdup(in); - char* tmp = s; + char* tmp = s; if (!s) return NULL; /* Count how many elements will be extracted. */ - while (*tmp) - { - if (d == *tmp) - { - count++; - last_delim = tmp; - } - tmp++; + while (*tmp) { + if (d == *tmp) { + count++; + last_delim = tmp; + } + tmp++; } /* Add space for trailing token. */ @@ -639,17 +637,15 @@ char** string_split(const char* in, const char d) result = malloc(sizeof(char*) * count); - if (result) - { - size_t idx = 0; - char* token = strtok(s, delim); - - while (token) - { - *(result + idx++) = strdup(token); - token = strtok(0, delim); - } - *(result + idx) = 0; + if (result) { + size_t idx = 0; + char* token = strtok(s, delim); + + while (token) { + *(result + idx++) = strdup(token); + token = strtok(0, delim); + } + *(result + idx) = 0; } free(s);