c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Improve compatibility with C++ consumers

Browse Source 
C++ is a little picky about not using keywords for names, or string
constness.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Jorgen Lundman <lundman@lundman.net>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10409
This commit is contained in:
Ryan Moeller
2020-06-06 15:54:04 -04:00
committed by GitHub
parent c1f3de18a4
commit 60265072e0
16 changed files with 64 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libzfs/os/freebsd/libzfs_compat.c
+1 -1
View File
@@ -247,7 +247,7 @@ zpool_relabel_disk(libzfs_handle_t *hdl, const char *path, const char *msg)
}
int
zpool_label_disk(libzfs_handle_t *hdl, zpool_handle_t *zhp, char *name)
zpool_label_disk(libzfs_handle_t *hdl, zpool_handle_t *zhp, const char *name)
{
return (0);
}
lib/libzfs/os/linux/libzfs_pool_os.c
+1 -1
View File
@@ -212,7 +212,7 @@ zpool_label_name(char *label_name, int label_size)
* stripped of any leading /dev path.
*/
int
zpool_label_disk(libzfs_handle_t *hdl, zpool_handle_t *zhp, char *name)
zpool_label_disk(libzfs_handle_t *hdl, zpool_handle_t *zhp, const char *name)
{
char path[MAXPATHLEN];
struct dk_gpt *vtoc;