libzfs: pool: fix false-positives -Wmaybe-uninitialised

As noted by gcc (Debian 10.2.1-6) 10.2.1 20210110 Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes openzfs#13316
andrewc12 · Sep 23, 2022 · b59227f · b59227f
1 parent dcc270c
commit b59227f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/lib/libzfs/libzfs_pool.c b/lib/libzfs/libzfs_pool.c
@@ -5183,7 +5183,7 @@ zpool_get_vdev_prop(zpool_handle_t *zhp, const char *vdevname, vdev_prop_t prop,
 {
 	nvlist_t *reqnvl, *reqprops;
 	nvlist_t *retprops = NULL;
-	uint64_t vdev_guid;
+	uint64_t vdev_guid = 0;
 	int ret;
 
 	if ((ret = zpool_vdev_guid(zhp, vdevname, &vdev_guid)) != 0)
@@ -5242,7 +5242,7 @@ zpool_get_all_vdev_props(zpool_handle_t *zhp, const char *vdevname,
     nvlist_t **outnvl)
 {
 	nvlist_t *nvl = NULL;
-	uint64_t vdev_guid;
+	uint64_t vdev_guid = 0;
 	int ret;
 
 	if ((ret = zpool_vdev_guid(zhp, vdevname, &vdev_guid)) != 0)

diff --git a/module/icp/algs/edonr/edonr.c b/module/icp/algs/edonr/edonr.c
@@ -47,10 +47,7 @@
 #define	hashState384(x)	((x)->pipe->p512)
 #define	hashState512(x)	((x)->pipe->p512)
 
-/* shift and rotate shortcuts */
-#define	shl(x, n)	((x) << n)
-#define	shr(x, n)	((x) >> n)
-
+/* rotate shortcuts */
 #define	rotl32(x, n)	(((x) << (n)) | ((x) >> (32 - (n))))
 #define	rotr32(x, n)	(((x) >> (n)) | ((x) << (32 - (n))))