diff options
| author | Sasha Levitskiy <sanek@google.com> | 2014-04-12 00:02:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-12 00:02:33 +0000 |
| commit | e2acb82a9449d0bbf993cda270f3519862ec571a (patch) | |
| tree | 363fff0183ffc1c252f381da52dab5e4ab57c3fd /fs_mgr | |
| parent | c5543320b024596c86fcb7b05b0b0f9ff609a9d1 (diff) | |
| parent | 43cb7ae6c31ced8cd518eab59dfea31ab1ade812 (diff) | |
| download | system_core-e2acb82a9449d0bbf993cda270f3519862ec571a.tar.gz system_core-e2acb82a9449d0bbf993cda270f3519862ec571a.tar.bz2 system_core-e2acb82a9449d0bbf993cda270f3519862ec571a.zip | |
am 43cb7ae6: am 4f362e43: am 835526fd: Merge "Cleanup: warning fixit."
* commit '43cb7ae6c31ced8cd518eab59dfea31ab1ade812':
Cleanup: warning fixit.
Diffstat (limited to 'fs_mgr')
| -rw-r--r-- | fs_mgr/fs_mgr_fstab.c | 2 | ||||
| -rw-r--r-- | fs_mgr/fs_mgr_main.c | 8 | ||||
| -rw-r--r-- | fs_mgr/include/fs_mgr.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fs_mgr/fs_mgr_fstab.c b/fs_mgr/fs_mgr_fstab.c index 8557bcfa1..98a2af47d 100644 --- a/fs_mgr/fs_mgr_fstab.c +++ b/fs_mgr/fs_mgr_fstab.c @@ -343,7 +343,7 @@ void fs_mgr_free_fstab(struct fstab *fstab) /* Add an entry to the fstab, and return 0 on success or -1 on error */ int fs_mgr_add_entry(struct fstab *fstab, const char *mount_point, const char *fs_type, - const char *blk_device, long long length) + const char *blk_device) { struct fstab_rec *new_fstab_recs; int n = fstab->num_entries; diff --git a/fs_mgr/fs_mgr_main.c b/fs_mgr/fs_mgr_main.c index 4bde4a1da..e5a00d595 100644 --- a/fs_mgr/fs_mgr_main.c +++ b/fs_mgr/fs_mgr_main.c @@ -80,10 +80,10 @@ int main(int argc, char *argv[]) int a_flag=0; int u_flag=0; int n_flag=0; - char *n_name; - char *n_blk_dev; - char *fstab_file; - struct fstab *fstab; + char *n_name=NULL; + char *n_blk_dev=NULL; + char *fstab_file=NULL; + struct fstab *fstab=NULL; klog_init(); klog_set_level(6); diff --git a/fs_mgr/include/fs_mgr.h b/fs_mgr/include/fs_mgr.h index 0f90c32f1..835cf6456 100644 --- a/fs_mgr/include/fs_mgr.h +++ b/fs_mgr/include/fs_mgr.h @@ -57,7 +57,7 @@ int fs_mgr_get_crypt_info(struct fstab *fstab, char *key_loc, char *real_blk_device, int size); int fs_mgr_add_entry(struct fstab *fstab, const char *mount_point, const char *fs_type, - const char *blk_device, long long length); + const char *blk_device); struct fstab_rec *fs_mgr_get_entry_for_mount_point(struct fstab *fstab, const char *path); int fs_mgr_is_voldmanaged(struct fstab_rec *fstab); int fs_mgr_is_nonremovable(struct fstab_rec *fstab); |