commit f24f51735156a663913c7f20b9538a6023e28f03
author Kenny Root <kroot@google.com> Wed Oct 10 14:31:03 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 10 14:31:03 2012 -0700
tree 04f09da37d33bc3b64e712d842b520c7056d327c
parent b6ec0c821be102b4657ac5acbad564d4206df14e
parent 461f556eb424eb25e692e60b571f4d32dfa4202c

am 461f556e: am b67683f6: Merge "make_ext4fs: add const qualifier to mountpoint"

* commit '461f556eb424eb25e692e60b571f4d32dfa4202c':
  make_ext4fs: add const qualifier to mountpoint

ext4_utils/make_ext4fs.c

diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index be63e27..662da6d 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -323,8 +323,9 @@
 }
 
 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;

ext4_utils/make_ext4fs.h

diff --git a/ext4_utils/make_ext4fs.h b/ext4_utils/make_ext4fs.h
index c217c3d..bfc008a 100644
--- a/ext4_utils/make_ext4fs.h
+++ b/ext4_utils/make_ext4fs.h
@@ -38,8 +38,9 @@
 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
 }