Tito sent in a few patches converting instances of CONFIG_FEATURE_CLEAN_UP to
ENABLE_FEATURE_CLEAN_UP.
This commit is contained in:
parent
02eb934b0f
commit
658d2cf986
@ -99,9 +99,9 @@ PIPE:
|
|||||||
status=EXIT_FAILURE;
|
status=EXIT_FAILURE;
|
||||||
}
|
}
|
||||||
} while ( --argc > 0 );
|
} while ( --argc > 0 );
|
||||||
#ifdef CONFIG_FEATURE_CLEAN_UP
|
|
||||||
free(string);
|
if (ENABLE_FEATURE_CLEAN_UP) free(string);
|
||||||
#endif
|
|
||||||
bb_fflush_stdout_and_exit(status);
|
bb_fflush_stdout_and_exit(status);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,15 +35,15 @@ extern int fdflush_main(int argc, char **argv)
|
|||||||
{
|
{
|
||||||
int fd, result;
|
int fd, result;
|
||||||
|
|
||||||
if (argc <= 1)
|
if (argc != 2)
|
||||||
bb_show_usage();
|
bb_show_usage();
|
||||||
|
|
||||||
fd = bb_xopen(argv[1], 0);
|
fd = bb_xopen(argv[1], 0);
|
||||||
|
|
||||||
result = ioctl(fd, FDFLUSH, 0);
|
result = ioctl(fd, FDFLUSH, 0);
|
||||||
#ifdef CONFIG_FEATURE_CLEAN_UP
|
|
||||||
close(fd);
|
if (ENABLE_FEATURE_CLEAN_UP) close(fd);
|
||||||
#endif
|
|
||||||
if (result) {
|
if (result) {
|
||||||
bb_perror_nomsg_and_die();
|
bb_perror_nomsg_and_die();
|
||||||
}
|
}
|
||||||
|
@ -147,14 +147,14 @@ int fdformat_main(int argc,char **argv)
|
|||||||
/* There is no point in freeing blocks at the end of a program, because
|
/* There is no point in freeing blocks at the end of a program, because
|
||||||
all of the program's space is given back to the system when the process
|
all of the program's space is given back to the system when the process
|
||||||
terminates.*/
|
terminates.*/
|
||||||
#ifdef CONFIG_FEATURE_CLEAN_UP
|
|
||||||
free(data);
|
if (ENABLE_FEATURE_CLEAN_UP) free(data);
|
||||||
#endif
|
|
||||||
print_and_flush("done\n", NULL);
|
print_and_flush("done\n", NULL);
|
||||||
}
|
}
|
||||||
#ifdef CONFIG_FEATURE_CLEAN_UP
|
|
||||||
close(fd);
|
if (ENABLE_FEATURE_CLEAN_UP) close(fd);
|
||||||
#endif
|
|
||||||
/* Don't bother closing. Exit does
|
/* Don't bother closing. Exit does
|
||||||
* that, so we can save a few bytes */
|
* that, so we can save a few bytes */
|
||||||
return EXIT_SUCCESS;
|
return EXIT_SUCCESS;
|
||||||
|
@ -47,9 +47,9 @@ freeramdisk_main(int argc, char **argv)
|
|||||||
fd = bb_xopen(argv[1], O_RDWR);
|
fd = bb_xopen(argv[1], O_RDWR);
|
||||||
|
|
||||||
result = ioctl(fd, BLKFLSBUF);
|
result = ioctl(fd, BLKFLSBUF);
|
||||||
#ifdef CONFIG_FEATURE_CLEAN_UP
|
|
||||||
close(fd);
|
if (ENABLE_FEATURE_CLEAN_UP) close(fd);
|
||||||
#endif
|
|
||||||
if (result < 0) {
|
if (result < 0) {
|
||||||
bb_perror_msg_and_die("failed ioctl on %s", argv[1]);
|
bb_perror_msg_and_die("failed ioctl on %s", argv[1]);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user