Skip to content

Const-ify string functions #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jlduran wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Const-ify string functions #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jectl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ extern libzfs_handle_t *lzh;
extern const char *jepool;
extern const char *jeroot;

int get_property(zfs_handle_t *, const char *, char **);
int get_property(zfs_handle_t *, const char *, const char **);

zfs_handle_t * get_jail_dataset(const char *);
zfs_handle_t * get_active_je(zfs_handle_t *);
Expand Down
2 changes: 1 addition & 1 deletion jectl_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ static void
print_je(zfs_handle_t *je)
{
char *name;
char *value;
const char *value;
char buffer[ZFS_MAXPROPLEN];

name = strdup(zfs_get_name(je));
Expand Down
2 changes: 1 addition & 1 deletion jectl_import.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ je_import(const char *import_name)
zfs_handle_t *zhp;
recvflags_t flags = { .nomount = 1 };
char name[ZFS_MAXPROPLEN];
char *default_je;
const char *default_je;
struct renameflags rflags = { 0 };

snprintf(name, sizeof(name), "%s/jectl.XXXXXX", jeroot);
Expand Down
4 changes: 2 additions & 2 deletions jectl_update.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct compare_info {
static bool
is_equal(zfs_handle_t *a, zfs_handle_t *b, const char *property)
{
char *astr, *bstr;
const char *astr, *bstr;
int error1, error2;

error1 = get_property(a, property, &astr);
Expand All @@ -60,7 +60,7 @@ compare_je(zfs_handle_t *zhp, void *arg)
{
struct compare_info *ci __unused;
zfs_handle_t *je;
char *v1, *v2;
const char *v1, *v2;

ci = arg;

Expand Down
6 changes: 3 additions & 3 deletions jectl_util.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ get_jail_dataset(const char *jailname)
zfs_handle_t *
get_active_je(zfs_handle_t *jds)
{
char *je_name;
const char *je_name;

if (get_property(jds, "je:active", &je_name) != 0)
return (NULL);
Expand All @@ -56,7 +56,7 @@ get_active_je(zfs_handle_t *jds)
}

int
get_property(zfs_handle_t *zhp, const char *property, char **val)
get_property(zfs_handle_t *zhp, const char *property, const char **val)
{
int error;
nvlist_t *nvl, *propval;
Expand Down Expand Up @@ -85,7 +85,7 @@ je_copy_user_props(zfs_handle_t *src, zfs_handle_t *target)
{
struct nvpair *nvp;
nvlist_t *nvl, *propval, *nnvl;
char *value;
const char *value;

if (nvlist_alloc(&nnvl, NV_UNIQUE_NAME, 0) != 0)
return (ENOMEM);
Expand Down