diff options
| author | Wang Shilong <wangsl-fnst@cn.fujitsu.com> | 2013-01-20 16:04:15 -0500 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2013-01-21 18:28:01 +0100 |
| commit | 9886166880ad36f586edd8f9fd220cc416b0d594 (patch) | |
| tree | c592aae4222857429e83de86debaec4d63c8035b /qgroup.c | |
| parent | f933e084eafe3f0b441f0ffb99505fc34a66194e (diff) | |
Btrfs-progs: clean up reduplicate parse_qgroupid() and replace atoi with strtoull
1. parse_qgroupid() is implemented twice, clean up the reduplicate code.
2. atoi() can not detect errors, so use strtoull() instead of it.
Signed-off-by: Wang Shilong <wangsl-fnst@cn.fujitsu.com>
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Gene Czarcinski <gene@czarc.net>
Diffstat (limited to 'qgroup.c')
| -rw-r--r-- | qgroup.c | 22 |
1 files changed, 18 insertions, 4 deletions
@@ -22,15 +22,29 @@ u64 parse_qgroupid(char *p) { char *s = strchr(p, '/'); + char *ptr_src_end = p + strlen(p); + char *ptr_parse_end = NULL; u64 level; u64 id; - if (!s) - return atoll(p); - level = atoll(p); - id = atoll(s + 1); + if (!s) { + id = strtoull(p, &ptr_parse_end, 10); + if (ptr_parse_end != ptr_src_end) + goto err; + return id; + } + level = strtoull(p, &ptr_parse_end, 10); + if (ptr_parse_end != s) + goto err; + + id = strtoull(s+1, &ptr_parse_end, 10); + if (ptr_parse_end != ptr_src_end) + goto err; return (level << 48) | id; +err: + fprintf(stderr, "ERROR:invalid qgroupid\n"); + exit(-1); } int qgroup_inherit_size(struct btrfs_qgroup_inherit *p) |