diff options
| author | Sasha Levitskiy <sanek@google.com> | 2014-04-11 23:54:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-11 23:54:05 +0000 |
| commit | 835526fdc035cad6d712a7098d0eae37b3995d2c (patch) | |
| tree | a430a147ff40a82058ac8316be127dab59d6f4fc /fs_mgr | |
| parent | 2f365509eb8a3696feb8063ba8e17ebd12beb7ff (diff) | |
| parent | cdc1cfb3e51f3caddc1f290b46dc789c036f22ed (diff) | |
| download | system_core-835526fdc035cad6d712a7098d0eae37b3995d2c.zip system_core-835526fdc035cad6d712a7098d0eae37b3995d2c.tar.gz system_core-835526fdc035cad6d712a7098d0eae37b3995d2c.tar.bz2 | |
Merge "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 6145771..45bbfdc 100644 --- a/fs_mgr/fs_mgr_fstab.c +++ b/fs_mgr/fs_mgr_fstab.c @@ -337,7 +337,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 4bde4a1..e5a00d5 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 0f90c32..835cf64 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); |