aboutsummaryrefslogtreecommitdiff
path: root/e2fsprogs/blkid
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-03-01 16:39:45 +0000
committerRob Landley <rob@landley.net>2006-03-01 16:39:45 +0000
commite7c43b66d74ee9902a6732122788a7a16bcfbf18 (patch)
treeebb8583e9e1265588592614c0b4878daded44125 /e2fsprogs/blkid
parent93f2286e6e59dab5eed14b5912a79254031c5a62 (diff)
downloadbusybox-w32-e7c43b66d74ee9902a6732122788a7a16bcfbf18.tar.gz
busybox-w32-e7c43b66d74ee9902a6732122788a7a16bcfbf18.tar.bz2
busybox-w32-e7c43b66d74ee9902a6732122788a7a16bcfbf18.zip
Cleanup patch from Denis Vlasenko. Mostly variants of removing the if(x)
from before "if(x) free(x)".
Diffstat (limited to 'e2fsprogs/blkid')
-rw-r--r--e2fsprogs/blkid/cache.c3
-rw-r--r--e2fsprogs/blkid/devno.c3
-rw-r--r--e2fsprogs/blkid/resolve.c6
-rw-r--r--e2fsprogs/blkid/save.c3
-rw-r--r--e2fsprogs/blkid/tag.c18
5 files changed, 11 insertions, 22 deletions
diff --git a/e2fsprogs/blkid/cache.c b/e2fsprogs/blkid/cache.c
index 87be1269f..daccb30b3 100644
--- a/e2fsprogs/blkid/cache.c
+++ b/e2fsprogs/blkid/cache.c
@@ -88,8 +88,7 @@ void blkid_put_cache(blkid_cache cache)
88 } 88 }
89 blkid_free_tag(tag); 89 blkid_free_tag(tag);
90 } 90 }
91 if (cache->bic_filename) 91 free(cache->bic_filename);
92 free(cache->bic_filename);
93 92
94 free(cache); 93 free(cache);
95} 94}
diff --git a/e2fsprogs/blkid/devno.c b/e2fsprogs/blkid/devno.c
index 7d083e76f..2979280f7 100644
--- a/e2fsprogs/blkid/devno.c
+++ b/e2fsprogs/blkid/devno.c
@@ -218,8 +218,7 @@ int main(int argc, char** argv)
218 } 218 }
219 printf("Looking for device 0x%04Lx\n", devno); 219 printf("Looking for device 0x%04Lx\n", devno);
220 devname = blkid_devno_to_devname(devno); 220 devname = blkid_devno_to_devname(devno);
221 if (devname) 221 free(devname);
222 free(devname);
223 return 0; 222 return 0;
224} 223}
225#endif 224#endif
diff --git a/e2fsprogs/blkid/resolve.c b/e2fsprogs/blkid/resolve.c
index 591b63057..40d999a1b 100644
--- a/e2fsprogs/blkid/resolve.c
+++ b/e2fsprogs/blkid/resolve.c
@@ -96,10 +96,8 @@ char *blkid_get_devname(blkid_cache cache, const char *token,
96 ret = blkid_strdup(blkid_dev_devname(dev)); 96 ret = blkid_strdup(blkid_dev_devname(dev));
97 97
98errout: 98errout:
99 if (t) 99 free(t);
100 free(t); 100 free(v);
101 if (v)
102 free(v);
103 if (!cache) { 101 if (!cache) {
104 blkid_put_cache(c); 102 blkid_put_cache(c);
105 } 103 }
diff --git a/e2fsprogs/blkid/save.c b/e2fsprogs/blkid/save.c
index cc406ebfb..98d8d0260 100644
--- a/e2fsprogs/blkid/save.c
+++ b/e2fsprogs/blkid/save.c
@@ -148,8 +148,7 @@ int blkid_flush_cache(blkid_cache cache)
148 } 148 }
149 149
150errout: 150errout:
151 if (tmp) 151 free(tmp);
152 free(tmp);
153 return ret; 152 return ret;
154} 153}
155 154
diff --git a/e2fsprogs/blkid/tag.c b/e2fsprogs/blkid/tag.c
index e2c785cf0..95112eba5 100644
--- a/e2fsprogs/blkid/tag.c
+++ b/e2fsprogs/blkid/tag.c
@@ -41,11 +41,8 @@ void blkid_free_tag(blkid_tag tag)
41 list_del(&tag->bit_tags); /* list of tags for this device */ 41 list_del(&tag->bit_tags); /* list of tags for this device */
42 list_del(&tag->bit_names); /* list of tags with this type */ 42 list_del(&tag->bit_names); /* list of tags with this type */
43 43
44 if (tag->bit_name) 44 free(tag->bit_name);
45 free(tag->bit_name); 45 free(tag->bit_val);
46 if (tag->bit_val)
47 free(tag->bit_val);
48
49 free(tag); 46 free(tag);
50} 47}
51 48
@@ -112,8 +109,7 @@ int blkid_set_tag(blkid_dev dev, const char *name,
112 return -BLKID_ERR_MEM; 109 return -BLKID_ERR_MEM;
113 t = blkid_find_tag_dev(dev, name); 110 t = blkid_find_tag_dev(dev, name);
114 if (!value) { 111 if (!value) {
115 if (t) 112 blkid_free_tag(t);
116 blkid_free_tag(t);
117 } else if (t) { 113 } else if (t) {
118 if (!strcmp(t->bit_val, val)) { 114 if (!strcmp(t->bit_val, val)) {
119 /* Same thing, exit */ 115 /* Same thing, exit */
@@ -165,12 +161,10 @@ int blkid_set_tag(blkid_dev dev, const char *name,
165 return 0; 161 return 0;
166 162
167errout: 163errout:
168 if (t) 164 blkid_free_tag(t);
169 blkid_free_tag(t); 165 if (!t)
170 else if (val)
171 free(val); 166 free(val);
172 if (head) 167 blkid_free_tag(head);
173 blkid_free_tag(head);
174 return -BLKID_ERR_MEM; 168 return -BLKID_ERR_MEM;
175} 169}
176 170