forked from brl/citadel
Bruce Leidl
4c3baa433b
Updated Recipes
* dash-to-panel 40
* dconf 0.38.0
* gdm 3.38.0
* glib 2.66.1
* gjs 1.66.0
* gnome-autoar 0.2.4
* gnome-backgrounds 3.38.0
* gnome-bluetooth 3.34.3
* gnome-control-center 3.38.1
* gnome-screenshot 3.38.0
* gnome-shell 3.38.1
* gnome-session 3.38.0
* gnome-settings-daemon 3.38.0
* gnome-terminal 3.38.0
* gnome-usage 3.38.0
* graphene 1.10.2
* gsettings-desktop-schema 3.38.0
* gvfs 1.46.1
* iwd 1.9
* libgee 0.20.3
* libgtop 2.40.0
* libgweather 3.36.1
* mkpasswd 5.5.7
* mozjs 78.0.1
* mutter 3.38.1
* nautilus 3.38.1
* networkmanager 1.26.4
* polkit 0.118
* tracker 3.0.1
* vte 0.62.0
Removed because recipes exist in poky with adequate version
* atk, at-spi
* clutter
* clutter-gtk
* cogl
* ell
* gcr
* itstool
* libinput
* pango
Other removed recipes
* systemd-initrd No longer using a separate systemd recipe
for initramfs
* caribou What even is this
* gnome-tweaks Not used
* mozjs Polkit no longer requires an ancient mozjs
* mozjs68 Upgraded to mozjs78
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From 1136cad77c2dc7d8e1daa317877676733e805f29 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Wed, 26 Aug 2020 17:30:40 -0700
|
|
Subject: [PATCH] pkix: Do not use NULL where 0 is needed
|
|
|
|
Clang finds this error
|
|
|
|
pkix_logger.c:316:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast]
|
|
logger->logComponent = (PKIX_ERRORCLASS)NULL;
|
|
^~~~~~~~~~~~~~~~~~~~~
|
|
pkix_logger.c:617:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast]
|
|
logger->logComponent = (PKIX_ERRORCLASS)NULL;
|
|
^~~~~~~~~~~~~~~~~~~~~
|
|
2 errors generated.
|
|
|
|
Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1661378]
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
nss/lib/libpkix/pkix/util/pkix_logger.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/nss/lib/libpkix/pkix/util/pkix_logger.c b/nss/lib/libpkix/pkix/util/pkix_logger.c
|
|
index a916e6e..10f537a 100644
|
|
--- a/nss/lib/libpkix/pkix/util/pkix_logger.c
|
|
+++ b/nss/lib/libpkix/pkix/util/pkix_logger.c
|
|
@@ -313,7 +313,7 @@ pkix_Logger_Destroy(
|
|
|
|
logger->callback = NULL;
|
|
PKIX_DECREF(logger->context);
|
|
- logger->logComponent = (PKIX_ERRORCLASS)NULL;
|
|
+ logger->logComponent = (PKIX_ERRORCLASS)0;
|
|
|
|
cleanup:
|
|
|
|
@@ -614,7 +614,7 @@ PKIX_Logger_Create(
|
|
|
|
logger->callback = callback;
|
|
logger->maxLevel = 0;
|
|
- logger->logComponent = (PKIX_ERRORCLASS)NULL;
|
|
+ logger->logComponent = (PKIX_ERRORCLASS)0;
|
|
|
|
PKIX_INCREF(loggerContext);
|
|
logger->context = loggerContext;
|
|
--
|
|
2.28.0
|
|
|