summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2012-10-10 12:21:20 -0700
committerGerrit Code Review <noreply-gerritcodereview@google.com>2012-10-10 12:21:20 -0700
commitb67683f6c0c75536c991cac797b0c1dbcf9168e0 (patch)
tree9e25fb06d7f74c9786c7d0170ad1f0786805464c
parent7793c09ec42bf1a01a5f45f0e723f9a36fcfd9d7 (diff)
parent7eac42d21d448b1a7a983ede70d34f0927be37ae (diff)
downloadextras-b67683f6c0c75536c991cac797b0c1dbcf9168e0.tar.gz
Merge "make_ext4fs: add const qualifier to mountpoint"
-rw-r--r--ext4_utils/make_ext4fs.c5
-rw-r--r--ext4_utils/make_ext4fs.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index be63e276..662da6d9 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -323,8 +323,9 @@ int make_ext4fs(const char *filename, s64 len,
}
int make_ext4fs_internal(int fd, const char *directory,
- char *mountpoint, fs_config_func_t fs_config_func, int gzip, int sparse,
- int crc, int wipe, int init_itabs, struct selabel_handle *sehnd)
+ const char *mountpoint, fs_config_func_t fs_config_func, int gzip,
+ int sparse, int crc, int wipe, int init_itabs,
+ struct selabel_handle *sehnd)
{
u32 root_inode_num;
u16 root_mode;
diff --git a/ext4_utils/make_ext4fs.h b/ext4_utils/make_ext4fs.h
index c217c3db..bfc008a2 100644
--- a/ext4_utils/make_ext4fs.h
+++ b/ext4_utils/make_ext4fs.h
@@ -38,8 +38,9 @@ void reset_ext4fs_info();
int make_ext4fs(const char *filename, s64 len,
const char *mountpoint, struct selabel_handle *sehnd);
int make_ext4fs_internal(int fd, const char *directory,
- char *mountpoint, fs_config_func_t fs_config_func, int gzip, int sparse,
- int crc, int wipe, int init_itabs, struct selabel_handle *sehnd);
+ const char *mountpoint, fs_config_func_t fs_config_func, int gzip,
+ int sparse, int crc, int wipe, int init_itabs,
+ struct selabel_handle *sehnd);
#ifdef __cplusplus
}