MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-14 14:25:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

libmusicbrainz: Avoid -Wnonnull warning

Browse Source 
This warning is turned into error with gcc 12.2 and when we use
updated version of neon27 which has added an attribute nonnull to
the ne_set_request_body_buffer API causes this to fail.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Khem Raj 2022-08-25 16:30:42 -07:00
parent c46c759c2b
commit 3fa331f5e7
2 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz/0001-http-fetch-Pass-a-non-null-buffer-to-ne_set_request_.patch Normal file
View File

@ -0,0 +1,50 @@
From 06b2a6aa70616aafab780514d9d26e85bd98d965 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Thu, 25 Aug 2022 14:02:16 -0700
Subject: [PATCH] http/fetch: Pass a non-null buffer to
ne_set_request_body_buffer API
Newer versions of neon has added a check for non-null arguments for
ne_set_request_body_buffer() API and this is triggered but older
compiler only treats -Wnonnull as warning so all was fine, however gcc
12.2 has started to throw this warning as error by default and builds
are breaking
Fixes
src/HTTPFetch.cc:186:38: warning: null passed to a callee that requires a non-null argument [-Wnonnull]
ne_set_request_body_buffer(req,0,0);
~ ^
Upstream-Status: Submitted [https://github.com/metabrainz/libmusicbrainz/pull/18]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/HTTPFetch.cc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/HTTPFetch.cc b/src/HTTPFetch.cc
index baec359..0c0d919 100644
--- a/src/HTTPFetch.cc
+++ b/src/HTTPFetch.cc
@@ -182,8 +182,10 @@ int MusicBrainz5::CHTTPFetch::Fetch(const std::string& URL, const std::string& R
}
ne_request *req = ne_request_create(sess, Request.c_str(), URL.c_str());
+ ne_buffer *body = ne_buffer_create();
+
if (Request=="PUT")
- ne_set_request_body_buffer(req,0,0);
+ ne_set_request_body_buffer(req, body->data, ne_buffer_size(body));
if (Request!="GET")
ne_set_request_flag(req, NE_REQFLAG_IDEMPOTENT, 0);
@@ -195,6 +197,8 @@ int MusicBrainz5::CHTTPFetch::Fetch(const std::string& URL, const std::string& R
Ret=m_d->m_Data.size();
+ ne_buffer_destroy(body);
+
ne_request_destroy(req);
m_d->m_ErrorMessage = ne_get_error(sess);
--
2.37.2

4
meta-multimedia/recipes-multimedia/musicbrainz/libmusicbrainz_git.bb
View File

@ -8,7 +8,9 @@ DEPENDS = "expat libxml2 libxml2-native neon neon-native libmusicbrainz-native"
PV = "5.1.0+git${SRCPV}"
SRCREV = "8be45b12a86bc0e46f2f836c8ac88e1e98d82aee"
SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git;branch=master;protocol=https"
SRC_URI = "git://github.com/metabrainz/libmusicbrainz.git;branch=master;protocol=https \
file://0001-http-fetch-Pass-a-non-null-buffer-to-ne_set_request_.patch \
"
S = "${WORKDIR}/git"