control: tags -1 patch

trivial patch attached.

On Fri, 07 Dec 2018 11:50:56 +0100 Birger Schacht <bir...@rantanplan.org> wrote:
> Source: psensor
> Version: 1.1.5-1
> Severity: normal
> Tags: upstream
> Control: block 904418 by -1
> 
> Dear Maintainer,
> 
> There exists a transition slot for json-c (see #904418).  When trying to
> rebuild all reverse dependencies of json-c, psensor fails to rebuild.
> 
> I am attaching the build log here for your convenience.
> 
> -- System Information:
> Debian Release: 9.6
>   APT prefers stable-updates
>   APT policy: (500, 'stable-updates'), (500, 'stable')
> Architecture: amd64 (x86_64)
> 
> Kernel: Linux 4.9.0-8-amd64 (SMP w/8 CPU cores)
> Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), 
> LANGUAGE=en_US:en (charmap=UTF-8)
> Shell: /bin/sh linked to /bin/dash
> Init: systemd (via /run/systemd/system)
Description: move away from is_error deprecated definition.
 is_error is just defined as check if pointer is not null
  #define is_error(ptr) (ptr == NULL)

Author: Gianfranco Costamagna <locutusofb...@debian.org>
Bug-Debian: https://bugs.debian.org/915851
Last-Update: 2019-06-30

--- psensor-1.1.5.orig/src/rsensor.c
+++ psensor-1.1.5/src/rsensor.c
@@ -125,7 +125,7 @@ struct psensor **get_remote_sensors(cons
 
 	obj = get_json_object(url);
 
-	if (obj && !is_error(obj)) {
+	if (obj) {
 		n = json_object_array_length(obj);
 		sensors = malloc((n + 1) * sizeof(struct psensor *));
 
@@ -160,12 +160,12 @@ void remote_psensor_update(struct psenso
 
 	obj = get_json_object(s->url);
 
-	if (obj && !is_error(obj)) {
+	if (obj) {
 		json_object *om;
 
 		json_object_object_get_ex(obj, "last_measure", &om);
 
-		if (!is_error(obj)) {
+		if (obj) {
 			json_object *ov, *ot;
 			struct timeval tv;
 

Reply via email to