aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-30 13:54:30 +0000
committeraldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-03-30 13:54:30 +0000
commitc168198bae6fbb2c7f493a3281f4ececad9216d0 (patch)
tree0b2ad7ef39da556b10a5772bde7fdb37a22938cd
parent0c55c39e2e134906b03f7147b5436dc8a7d1ea30 (diff)
downloadbusybox-w32-c168198bae6fbb2c7f493a3281f4ececad9216d0.tar.gz
busybox-w32-c168198bae6fbb2c7f493a3281f4ececad9216d0.tar.bz2
busybox-w32-c168198bae6fbb2c7f493a3281f4ececad9216d0.zip
- rename clean_up in tune2fs and mke2fs to be prefixed with their applet names.
Purely cosmetic to ease readability. git-svn-id: svn://busybox.net/trunk/busybox@14706 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--e2fsprogs/mke2fs.c4
-rw-r--r--e2fsprogs/tune2fs.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/e2fsprogs/mke2fs.c b/e2fsprogs/mke2fs.c
index e6a1392c9..787f28ebf 100644
--- a/e2fsprogs/mke2fs.c
+++ b/e2fsprogs/mke2fs.c
@@ -1199,7 +1199,7 @@ BLOCKSIZE_ERROR:
1199 return 1; 1199 return 1;
1200} 1200}
1201 1201
1202static void clean_up(void) 1202static void mke2fs_clean_up(void)
1203{ 1203{
1204 if (ENABLE_FEATURE_CLEAN_UP && journal_device) free(journal_device); 1204 if (ENABLE_FEATURE_CLEAN_UP && journal_device) free(journal_device);
1205} 1205}
@@ -1214,7 +1214,7 @@ int mke2fs_main (int argc, char *argv[])
1214 io_manager io_ptr; 1214 io_manager io_ptr;
1215 1215
1216 if (ENABLE_FEATURE_CLEAN_UP) 1216 if (ENABLE_FEATURE_CLEAN_UP)
1217 atexit(clean_up); 1217 atexit(mke2fs_clean_up);
1218 if(!PRS(argc, argv)) 1218 if(!PRS(argc, argv))
1219 return 0; 1219 return 0;
1220 1220
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index f228c56aa..2bd9a65ae 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -579,7 +579,7 @@ static ATTRIBUTE_NORETURN void do_findfs(int argc, char **argv)
579#define do_findfs(x, y) 579#define do_findfs(x, y)
580#endif 580#endif
581 581
582static void clean_up(void) 582static void tune2fs_clean_up(void)
583{ 583{
584 if (ENABLE_FEATURE_CLEAN_UP && device_name) free(device_name); 584 if (ENABLE_FEATURE_CLEAN_UP && device_name) free(device_name);
585 if (ENABLE_FEATURE_CLEAN_UP && journal_device) free(journal_device); 585 if (ENABLE_FEATURE_CLEAN_UP && journal_device) free(journal_device);
@@ -593,7 +593,7 @@ int tune2fs_main(int argc, char **argv)
593 io_manager io_ptr; 593 io_manager io_ptr;
594 594
595 if (ENABLE_FEATURE_CLEAN_UP) 595 if (ENABLE_FEATURE_CLEAN_UP)
596 atexit(clean_up); 596 atexit(tune2fs_clean_up);
597 597
598 if (ENABLE_FINDFS && (bb_applet_name[0] == 'f')) /* findfs */ 598 if (ENABLE_FINDFS && (bb_applet_name[0] == 'f')) /* findfs */
599 do_findfs(argc, argv); /* no return */ 599 do_findfs(argc, argv); /* no return */