From patchwork Thu Jul 18 20:30:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Wood X-Patchwork-Id: 1962208 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20230601 header.b=OkcyQ91I; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=j3hkZy+3; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::13c; helo=mail-il1-x13c.google.com; envelope-from=swupdate+bncbccpragruucbb7hw4w2amgqeuf5pf5q@googlegroups.com; receiver=patchwork.ozlabs.org) Received: from mail-il1-x13c.google.com (mail-il1-x13c.google.com [IPv6:2607:f8b0:4864:20::13c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WQ4Fb4ffPz1xrQ for ; Fri, 19 Jul 2024 06:30:58 +1000 (AEST) Received: by mail-il1-x13c.google.com with SMTP id e9e14a558f8ab-381c1efbd54sf16229985ab.3 for ; Thu, 18 Jul 2024 13:30:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1721334653; cv=pass; d=google.com; s=arc-20160816; b=cfULmh7Tk7/GrHLSUUFsph9SGR0KhJkktw+wOsSjFe82TV7ULfaj/4Bf6G2dxKDpPs giyhNJFlnUx9N5zSTaY1lHa4Y+Ltk0nnBeVtEPTlsN5W4njcD6RNEF9c/OXpGEmhhgXy JOl+gkhaUR1ysZpievYD+LYWC3Mrp8D37qMNV2VYu0VbE3yOufAwp5Cj5nKSPmK9TkDm 3cSKJB0O63zU3zhegnQHTWVfSCYN+qya3c7N4JBFMMp2vQE2Fhw1ufxPASLEVEypRBNQ yqdgaxYzt4lqM2idOYL9yWdkk7ef1rK8SfX73yDirkSvU3gcb8JlcDstgI2eWrda7dxT jW0g== 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:subject:from:to:content-language :user-agent:mime-version:date:message-id:sender:dkim-signature :dkim-signature; bh=RJGd2/YtZQVJhLUWeKDvxpIvoWYpBLFakqweJ5AY+Q4=; fh=k/gWmYZ60dI4YpzlZ3D5VRSCv9mU/H7rnuYM4iiUFBA=; b=nsx4I37vifSU7W3s4CDg1utRnY0WhxKvWiRh1FwB/yPXWCSEMwj4fu7Rq51VAt6rkG sFlIbG7NeOPD7BuJFZI7CnNGULrC/gy0OIZYmG6tFV6DIV7Z3cy+fCOv7GibDQxcb/Sd JfhRUOH6xH0EmmR7xOhB+XZnM0Rjm0BukKprSVLYhHk51xK254eWLhKcmAFAigFJnvHW sE68dHHyfqhyGsvieonhHpjm/uCh9zGtMLTFrCJ9vnf7Jpa6MvhStc6bneJUr8aaSiLP dsmk7fLDvpV0FkebJRx519N1L68nE7+2pxdOZBMwZXJfKDLvdKJOlT2LqbNE5YjC+eSA tQ/w==; darn=patchwork.ozlabs.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fcAtzzMb; spf=pass (google.com: domain of mattwood2000@gmail.com designates 2607:f8b0:4864:20::22e as permitted sender) smtp.mailfrom=mattwood2000@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@googlegroups.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1721334653; x=1721939453; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:subject:from:to:content-language:user-agent :mime-version:date:message-id:sender:from:to:cc:subject:date :message-id:reply-to; bh=RJGd2/YtZQVJhLUWeKDvxpIvoWYpBLFakqweJ5AY+Q4=; b=OkcyQ91It5oXTebXD8RXc23rqYZKcJW/276Bt123l9da3INKCoNZMkCxYCoie6Zk2k uXlVWa+uypXq3Mv6GHLvfW+R6LC1j3q01PONoqwMudXHhWx0ntBcij2LC7q7Ime16jAR OUcT3bjoXkEl1Fz/fx3kwN4tJ2DuXcFTdkZ3bnoM4GgoCclXJ7M6ST5VDsGE4VizG9Ko QWVLQDsWaE3Q57I/Td9oKgWIqnTiknwptKJ5jHXj1MhyfTWMSjTcFDK0sF8CTWmjpour +GqiyjdQq5bD1K/KtR12vjddggMOcHcNmzX+SQ8tP221wMSBBVJ0yvfAArF//aLtF8AX JLvQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721334653; x=1721939453; darn=patchwork.ozlabs.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:x-original-authentication-results :x-original-sender:subject:from:to:content-language:user-agent :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=RJGd2/YtZQVJhLUWeKDvxpIvoWYpBLFakqweJ5AY+Q4=; b=j3hkZy+3POB1tMqP1h504soODhoMwvU2UKJDrN/d9NhjZcgveBq+0dEZImpo+lBxm0 sT9suOmwy3yQoQZIVVJdkTQeg6Xh9ZIV9sKuiSolBeVCGcpkVJiw8mlqCfW4uoJqPAOC DG2e5U7x6/RdIw+i5EKR9t2SInXtaEi28gdA4cHFuN7GkdRENlhzt4TdLzaGHxB7q3kz DsrPvQ6L7/zVMXvaufEqvJtKaTp8qzNXVWHnxOEPYtfraEc2At+FUdmDZD3/+EegWS1h qUCPTDM3uuIi+I5oZtznSaCvF9V9HTShj94qV/H8w+djuA89rm5imKQBfImGw+PzfoQB vC5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721334653; x=1721939453; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:subject:from:to :content-language:user-agent:mime-version:date:message-id :x-beenthere:x-gm-message-state:sender:from:to:cc:subject:date :message-id:reply-to; bh=RJGd2/YtZQVJhLUWeKDvxpIvoWYpBLFakqweJ5AY+Q4=; b=YLlgR99WKAT/QyHlD8zgJe5h2VbTMzsi48XXzeS+S5XLkhy6fU6LF0vxx6whz31eFo 80/B+JkvE9zMvy6ZQoHJyLim0r0IxNjMr6wEMGm1Et/z0y0qCzXvkKl+KMrUt3uf+kZS VIHGZB7IiF6y/0KDpgTa/fsl1uXhaa0344ev8WoQebd8jNTPx+iu1qDlGJU7d+lSBDPO ti2MxnIVP8UhFFBXdfQLGgEICUZYFBFiR5xUIaFNodzYM2lTN8y0X/ZJcOX7znWQoTDL sg2KM5VOQxzXbZrV8qRv4Ltqyzg2UDIM9qaIdmtnlA1eoc+9C6ZhJ3+ko32Lh3qBmKez hzTA== Sender: swupdate@googlegroups.com X-Forwarded-Encrypted: i=2; AJvYcCXI3dhb7D9h2vuOCAxitwDFibowAQY4X2V3Q8GwwanKKv55c4juu57YsTlR736x9W61E1FA1m2XZvxCwKl03Dh9zFJ+RScpRccNYi1JoA== X-Gm-Message-State: AOJu0YzWoSkcBK1FC8N5h/rqLes1YWVM8nrKyM4GLAxsGpNy9ABLzTfa aiCZewDYdvr6jC9ravWipJ+1I+h9oA9KTCDC0Hh1vedDNb+0jUmw X-Google-Smtp-Source: AGHT+IF58J39z0KO2dilseovghNPZ/oHNnYL8MpaheKvoBwZ/1sqNcWv9xUapPxnlL/2DVxbJyNHdQ== X-Received: by 2002:a05:6e02:1a85:b0:376:148f:d6c6 with SMTP id e9e14a558f8ab-39557140782mr81474145ab.24.1721334652909; Thu, 18 Jul 2024 13:30:52 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a05:6e02:1386:b0:376:24de:8a87 with SMTP id e9e14a558f8ab-396407d57d1ls11331025ab.0.-pod-prod-09-us; Thu, 18 Jul 2024 13:30:51 -0700 (PDT) X-Received: by 2002:a05:6e02:2183:b0:396:5af7:64d1 with SMTP id e9e14a558f8ab-3965af767acmr46711775ab.18.1721334651828; Thu, 18 Jul 2024 13:30:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721334651; cv=none; d=google.com; s=arc-20160816; b=f3skK8Fji8YH5U/rshYq1HQzjlzfvoVdLua4lAPkNzwOPIuiYFGoGY6sqvHAtL3mU4 yVLbBYTQ7VziB9XAH4i+XfE3nB9zY0SVXFQcVE5ntb7jzj+pOEYCei+1tLlTJxin1JJj apAQk06NJo7uLHCT6TK9PUy3JF4uM0hv0SO5oxUlWTssC9QEqlOJVMzDQzkzDqVZngN6 9Q+TxKIj1Sb9dBnDwzLr6wjU1LN/Qk0KeIqFoZX2xKbhUmRcZpVkRsRJPHmzFRIMqqb4 a4gn5ufRameMptcwlMZR24rJ4wZ42ojaYfXYU02Pr2oUsAvG1Jm5xyuGAikkvSDYguvA dbfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:subject:from:to:content-language :user-agent:mime-version:date:message-id:dkim-signature; bh=noadtLX9nFL8vJA8sS3g19HKgy2QsNmt78E9oBzwh50=; fh=ZnR/GV7fAozRX3tpIO3vp/Jbul8ISZhdVjghlw9eWq0=; b=ZPtoVfdDpcQY0TBqX8EZJhSOdblLAkkPZaamEfcQtmuJ8J+FhnF4siYRpFxbsKiICa s4TzQ+TpgBbPD08s5uY5rNYluU9w3dRmfcTaUIJ71KlqV2dz16Z26KVkXMVcyKVD3v+I oCgkmtvn4wepuYQ3oPAe1/foIvafxoomcffUQM1c8qs+GywYfAih62Ktzxh9mm4D1Jn1 Dfd2gCOAIGVuKIpI9Uf0F/8o43Ejk1uxfB1BpBvQgjLw+WgF4WNi63RdILbujGrfLQfJ ysV8j9pPYfIbVJd+uRgebsv0RYLTzn3B4eXgpY5pSlvECGUAaSzm28YuX9Lp5MEV+b12 COsg==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fcAtzzMb; spf=pass (google.com: domain of mattwood2000@gmail.com designates 2607:f8b0:4864:20::22e as permitted sender) smtp.mailfrom=mattwood2000@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@googlegroups.com Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com. [2607:f8b0:4864:20::22e]) by gmr-mx.google.com with ESMTPS id e9e14a558f8ab-3950d1abc49si2032565ab.4.2024.07.18.13.30.51 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Jul 2024 13:30:51 -0700 (PDT) Received-SPF: pass (google.com: domain of mattwood2000@gmail.com designates 2607:f8b0:4864:20::22e as permitted sender) client-ip=2607:f8b0:4864:20::22e; Received: by mail-oi1-x22e.google.com with SMTP id 5614622812f47-3d93147ac6bso719757b6e.0 for ; Thu, 18 Jul 2024 13:30:51 -0700 (PDT) X-Received: by 2002:a05:6808:1450:b0:3d6:2fb8:2905 with SMTP id 5614622812f47-3dad1f6b5a9mr6829705b6e.42.1721334651151; Thu, 18 Jul 2024 13:30:51 -0700 (PDT) Received: from [192.168.1.225] (pool-71-184-93-59.bstnma.fios.verizon.net. [71.184.93.59]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-44f96ac2365sm5955011cf.78.2024.07.18.13.30.50 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 18 Jul 2024 13:30:50 -0700 (PDT) Message-ID: <2337867d-f1f8-4ebb-a841-c2d2eaac6f05@gmail.com> Date: Thu, 18 Jul 2024 16:30:50 -0400 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: swupdate From: Matt Wood Subject: [swupdate] [PATCH] swupdate-progress: Fix parsing of no-reboot message X-Original-Sender: mattwood2000@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fcAtzzMb; spf=pass (google.com: domain of mattwood2000@gmail.com designates 2607:f8b0:4864:20::22e as permitted sender) smtp.mailfrom=mattwood2000@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com; dara=pass header.i=@googlegroups.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: , Correct sscanf formatting to indicate if a reboot is not required. Signed-off-by: Matt Wood --- tools/swupdate-progress.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/swupdate-progress.c b/tools/swupdate-progress.c index 14040757..5e371627 100644 --- a/tools/swupdate-progress.c +++ b/tools/swupdate-progress.c @@ -354,7 +354,7 @@ int main(int argc, char **argv) * will be added, JSON lib should be linked. * NOTE: Until then, the exact string format is imperative! */ - n = sscanf(msg.info, "{\"%*d\": {\"%d\": { \"reboot-mode\" : \"%19[-a-z]\"}}}", + n = sscanf(msg.info, "{\"%d\": { \"reboot-mode\" : \"%19[-a-z]\"}}", &cause, reboot_mode); if (n == 2) { if (cause == CAUSE_REBOOT_MODE) {