From patchwork Tue Aug 28 17:50:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 145353 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1466175ljw; Tue, 28 Aug 2018 10:51:01 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYlCaLNFlwZPbSCrTxJyR+R6wzL38e06TzmEnz68FrtSnR0arqlM0hI3iMmI1qPItI0UyoJ X-Received: by 2002:a17:902:b78a:: with SMTP id e10-v6mr2544414pls.79.1535478661321; Tue, 28 Aug 2018 10:51:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1535478661; cv=none; d=google.com; s=arc-20160816; b=ezw5s2QUdjXAmuepF4c2aRoFBY7LP3Ftrm/PAw4PSSrGrhpEuqOTL1NzpVCiBRd0uW l5Z7LjKiDE6XXANBFQZUP7LPRtkCPYe7/Y5AvzQ3BjF97iu8geK9prdExYc83g++yuWb yCaRf1dZuW1PwpCllpfhLXRIBwXKGlFpGFjRx44Dq2+Xfy5KUlBxYAVxtQZ6Xnjmt+Rd ioec5WKFUkCga9Jd4fSJpsz5a6g6D6S9BMAshBxxn1liHpKHDKLcVMTELxoz9/x+9Lu4 UN3As2fFWt5Jy5ruNZNukNKvi40fQwBu6k0g1lCDo7FpKxPRRX8L26zh6D92DnhHiOO7 +pXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=IlqkonChbn4xcwT0gruAVGh3NhoW4n05Lpgnrzf5ZQE=; b=eewmEKQPoUFSubbMbI1cAzetswBHK2r4gdg37+u50nKs0xvud4cG9/xTESRs9hG0/l 4+ewkOjj8kYeZSULBoThycKrj9XvcHX3EeCSKZsybciLARmUv6Sn/Gdl8bv95SibjMKI 0bzzk/M/cMX9FJLQQzhsE0t+qSD58KGyQ8GC+wLLpG8aGcVSzFGqXlbXmVR4MDAma9FM wu802gryPI0psA8txuFHltk6oa8nyh/cvn720XKgLbss41p+osA2p98tSr2jeIsRmOP7 NVJWZYebBfNvThRLo51sdEKvFGOZ1auddi5CTlzGTt9PCStsQQ0DxeIMvndNM+yZ5JOe bJMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=l75IAk6l; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id a140-v6si1584635pfa.61.2018.08.28.10.51.01; Tue, 28 Aug 2018 10:51:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=l75IAk6l; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E363F78F6E; Tue, 28 Aug 2018 17:50:54 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) by mail.openembedded.org (Postfix) with ESMTP id 30D1878DEA for ; Tue, 28 Aug 2018 17:50:52 +0000 (UTC) Received: by mail-pg1-f177.google.com with SMTP id z4-v6so1087826pgv.2 for ; Tue, 28 Aug 2018 10:50:53 -0700 (PDT) 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; bh=nf3gr6ljfZody/Wxq/kBsDLdgTH3A9hJhxN4S3RvWSk=; b=l75IAk6lEyg0YKTk2KzqDAgntB/cZF5cKcVlyS5VtSQe99i6YQYFFepEElaKvW9O8N QyG08E9g+AfhbsaiqznwEkN1aH35PwswyI6ZERQB/dXHM7k2s8QinFGVYLQOu3AFhSuE rB/PI0ziAt9KSySzJxOq0UXsQsJsdf7G97/tnI4NzWTCNzNaKb4daFrT1Z3n6vulX8WL U9F+H2GSCOOcSm0UJE7pIsx6H3BAyY9wCOAg+4n8yWdBnOrcjcE/RjZr95+vcBKI4/xh HDc6M/oLPMYaD2orCbjPwD0VY37leOmdYv78WKBujviHlM1CDU3pZ/6qzQNz5WySdXk/ kUkQ== 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; bh=nf3gr6ljfZody/Wxq/kBsDLdgTH3A9hJhxN4S3RvWSk=; b=Ic27Tl7XvPbEgc7BEprv8mU8dhxbX9A8G3H7gWLR7U4SkWwcaI3WlJVISKSP5oOJn/ qpvTBBClzZ9LSXs+8C7iK19m014oTv1Dr2e4c8NIdg0wQj5SBF/Zl6PJ1ED22kGFDKDK vQlC+Q3JmW6p/Z9bGRHjzI0ck9bKmMsfrq2sdx47bTr4FLkaefnlgkZgdfybJO0wtjfI heddjg5sLQEtRPOQ2ggq89MiYSU9C39ad8BJ1/5z4j9u700DFYHWd8/5hxKtaYiAkTUk Bdp+jVhJjMjXHKYnkMQAD7i93lBiY/96hRF8GQj/X9pP4f/brs38Z5Vr9+Et0qD9DP50 X4Ww== X-Gm-Message-State: APzg51AGnfp5uHy/EXB04UlumBS9PQmHvs/D3rw1hrvJ9o8iga3AdU6j NFyINgHn/omFYyNgp1EFo4Petb4y X-Received: by 2002:a65:64d1:: with SMTP id t17-v6mr2466689pgv.207.1535478652847; Tue, 28 Aug 2018 10:50:52 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::f180]) by smtp.gmail.com with ESMTPSA id g184-v6sm3330295pgc.22.2018.08.28.10.50.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Aug 2018 10:50:51 -0700 (PDT) From: Khem Raj To: openembedded-core@lists.openembedded.org Date: Tue, 28 Aug 2018 10:50:38 -0700 Message-Id: X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [OE-core] [PATCH 2/4] systemd: Fix qsort_r patch for function return mismatch X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org clang is fussy and complains that a valueless return is used from a function which should return a value Signed-off-by: Khem Raj --- .../0002-don-t-use-glibc-specific-qsort_r.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.18.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch index f07211bd8a..8e0d669e83 100644 --- a/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch +++ b/meta/recipes-core/systemd/systemd/0002-don-t-use-glibc-specific-qsort_r.patch @@ -1,7 +1,7 @@ -From d43faf6d253db789225b7c454c8f255fbc68857e Mon Sep 17 00:00:00 2001 +From d74a4de6daea5a511c2b5636bbb552c15b3a4ad9 Mon Sep 17 00:00:00 2001 From: Emil Renner Berthing Date: Thu, 18 Sep 2014 15:24:56 +0200 -Subject: [PATCH 02/19] don't use glibc-specific qsort_r +Subject: [PATCH] don't use glibc-specific qsort_r Upstream-Status: Inappropriate [musl specific] @@ -14,7 +14,7 @@ Signed-off-by: Khem Raj 4 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/basic/format-table.c b/src/basic/format-table.c -index 94e796d1c..f7b4eade9 100644 +index 94e796d1ca..9b3f35c29a 100644 --- a/src/basic/format-table.c +++ b/src/basic/format-table.c @@ -745,29 +745,29 @@ static int cell_data_compare(TableData *a, size_t index_a, TableData *b, size_t @@ -63,7 +63,7 @@ index 94e796d1c..f7b4eade9 100644 - qsort_r_safe(sorted, n_rows, sizeof(size_t), table_data_compare, t); + if (n_rows <= 1) -+ return; ++ return 0; + assert(sorted); + user_table = t; + qsort(sorted, n_rows, sizeof(size_t), table_data_compare); @@ -72,7 +72,7 @@ index 94e796d1c..f7b4eade9 100644 if (t->display_map) diff --git a/src/basic/util.h b/src/basic/util.h -index 9699d228f..40eaf518c 100644 +index 9699d228f9..40eaf518cb 100644 --- a/src/basic/util.h +++ b/src/basic/util.h @@ -105,13 +105,6 @@ static inline void qsort_safe(void *base, size_t nmemb, size_t size, comparison_ @@ -90,7 +90,7 @@ index 9699d228f..40eaf518c 100644 /** * Normal memcpy requires src to be nonnull. We do nothing if n is 0. diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c -index 317cad8a6..701d59a1e 100644 +index 317cad8a67..701d59a1eb 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -135,13 +135,12 @@ static void trie_free(struct trie *trie) { @@ -135,7 +135,7 @@ index 317cad8a6..701d59a1e 100644 } diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c -index 02408a428..491d367d1 100644 +index 02408a4285..491d367d12 100644 --- a/src/udev/udevadm-hwdb.c +++ b/src/udev/udevadm-hwdb.c @@ -114,13 +114,13 @@ static void trie_node_cleanup(struct trie_node *node) { @@ -179,5 +179,5 @@ index 02408a428..491d367d1 100644 } -- -2.11.0 +2.18.0