svn commit: r338974 - stable/11/cddl/contrib/opensolaris/lib/libzfs/common

[Alexander Motin]

Author: mav
Date: Thu Sep 27 17:11:11 2018
New Revision: 338974
URL: https://svnweb.freebsd.org/changeset/base/338974

Log:
  MFC r333307 (by sbruno):
  Cleanup sundry clang warnings for code that is not upstream in illumos.
  https://github.com/illumos/illumos-gate/edit/master/usr/src/lib/libzfs/common/libzfs_sendrecv.c
  
  Patch our version of it to quiesce warnings until someone decides to sync
  up our code:
  
  libzfs_sendrecv.c:2555:30: warning: format specifies type 'unsigned long'
    but the argument has type 'uint64_t' (aka 'unsigned long long') [-Wformat]
                                  sprintf(guidname, "%lu", thisguid);
                                                     ~~~   ^~~~~~~~
                                                     %llu
  libzfs_sendrecv.c:2612:29: warning: format specifies type 'unsigned long'
    but the argument has type 'uint64_t' (aka 'unsigned long long') [-Wformat]
                          sprintf(guidname, "%lu", parent_fromsnap_guid);
                                             ~~~   ^~~~~~~~~~~~~~~~~~~~
                                             %llu
  libzfs_sendrecv.c:2645:29: warning: format specifies type 'unsigned long'
    but the argument has type 'uint64_t' (aka 'unsigned long long') [-Wformat]
                          sprintf(guidname, "%lu", parent_fromsnap_guid);
                                             ~~~   ^~~~~~~~~~~~~~~~~~~~
                                             %llu

Modified:
  stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
==============================================================================
--- stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Thu Sep 27 17:08:29 2018	(r338973)
+++ stable/11/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c	Thu Sep 27 17:11:11 2018	(r338974)
@@ -2552,7 +2552,7 @@ again:
 					needagain = B_TRUE;
 				else
 					progress = B_TRUE;
-				sprintf(guidname, "%lu", thisguid);
+				sprintf(guidname, "%" PRIu64, thisguid);
 				nvlist_add_boolean(deleted, guidname);
 				continue;
 			}
@@ -2609,7 +2609,7 @@ again:
 				needagain = B_TRUE;
 			else
 				progress = B_TRUE;
-			sprintf(guidname, "%lu", parent_fromsnap_guid);
+			sprintf(guidname, "%" PRIu64, parent_fromsnap_guid);
 			nvlist_add_boolean(deleted, guidname);
 			continue;
 		}
@@ -2642,7 +2642,7 @@ again:
 		if (stream_parent_fromsnap_guid != 0 &&
                     parent_fromsnap_guid != 0 &&
                     stream_parent_fromsnap_guid != parent_fromsnap_guid) {
-			sprintf(guidname, "%lu", parent_fromsnap_guid);
+			sprintf(guidname, "%" PRIu64, parent_fromsnap_guid);
 			if (nvlist_exists(deleted, guidname)) {
 				progress = B_TRUE;
 				needagain = B_TRUE;