aboutsummaryrefslogtreecommitdiff
path: root/include/libbb.h
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2009-04-21 11:09:40 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2009-04-21 11:09:40 +0000
commit5e34ff29bcc870936ab18172f438a34d042d4e03 (patch)
treea5e7a528f2f916eb883f1161eadceacdf2dca4be /include/libbb.h
parent8b814b4a349e2262c0ad25793b05206a14651ebb (diff)
downloadbusybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz
busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.bz2
busybox-w32-5e34ff29bcc870936ab18172f438a34d042d4e03.zip
*: mass renaming of USE_XXXX to IF_XXXX
and SKIP_XXXX to IF_NOT_XXXX - the second one was especially badly named. It was not skipping anything!
Diffstat (limited to 'include/libbb.h')
-rw-r--r--include/libbb.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 1faa9e9fd..4de3e7915 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -260,7 +260,7 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c, mv.c, install.c depend on them. */
260 FILEUTILS_SET_SECURITY_CONTEXT = 0x200 260 FILEUTILS_SET_SECURITY_CONTEXT = 0x200
261#endif 261#endif
262}; 262};
263#define FILEUTILS_CP_OPTSTR "pdRfilsL" USE_SELINUX("c") 263#define FILEUTILS_CP_OPTSTR "pdRfilsL" IF_SELINUX("c")
264extern int remove_file(const char *path, int flags) FAST_FUNC; 264extern int remove_file(const char *path, int flags) FAST_FUNC;
265/* NB: without FILEUTILS_RECUR in flags, it will basically "cat" 265/* NB: without FILEUTILS_RECUR in flags, it will basically "cat"
266 * the source, not copy (unless "source" is a directory). 266 * the source, not copy (unless "source" is a directory).
@@ -916,15 +916,15 @@ extern void bb_verror_msg(const char *s, va_list p, const char *strerr) FAST_FUN
916/* Applets which are useful from another applets */ 916/* Applets which are useful from another applets */
917int bb_cat(char** argv); 917int bb_cat(char** argv);
918/* If shell needs them, they exist even if not enabled as applets */ 918/* If shell needs them, they exist even if not enabled as applets */
919int echo_main(int argc, char** argv) USE_ECHO(MAIN_EXTERNALLY_VISIBLE); 919int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE);
920int printf_main(int argc, char **argv) USE_PRINTF(MAIN_EXTERNALLY_VISIBLE); 920int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE);
921int test_main(int argc, char **argv) USE_TEST(MAIN_EXTERNALLY_VISIBLE); 921int test_main(int argc, char **argv) IF_TEST(MAIN_EXTERNALLY_VISIBLE);
922int kill_main(int argc, char **argv) USE_KILL(MAIN_EXTERNALLY_VISIBLE); 922int kill_main(int argc, char **argv) IF_KILL(MAIN_EXTERNALLY_VISIBLE);
923/* Similar, but used by chgrp, not shell */ 923/* Similar, but used by chgrp, not shell */
924int chown_main(int argc, char **argv) USE_CHOWN(MAIN_EXTERNALLY_VISIBLE); 924int chown_main(int argc, char **argv) IF_CHOWN(MAIN_EXTERNALLY_VISIBLE);
925/* Used by ftpd */ 925/* Used by ftpd */
926int ls_main(int argc, char **argv) USE_LS(MAIN_EXTERNALLY_VISIBLE); 926int ls_main(int argc, char **argv) IF_LS(MAIN_EXTERNALLY_VISIBLE);
927/* Don't need USE_xxx() guard for these */ 927/* Don't need IF_xxx() guard for these */
928int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 928int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
929int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; 929int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
930 930
@@ -1253,7 +1253,7 @@ typedef struct procps_status_t {
1253/* Fields are set to 0/NULL if failed to determine (or not requested) */ 1253/* Fields are set to 0/NULL if failed to determine (or not requested) */
1254 uint16_t argv_len; 1254 uint16_t argv_len;
1255 char *argv0; 1255 char *argv0;
1256 USE_SELINUX(char *context;) 1256 IF_SELINUX(char *context;)
1257 /* Everything below must contain no ptrs to malloc'ed data: 1257 /* Everything below must contain no ptrs to malloc'ed data:
1258 * it is memset(0) for each process in procps_scan() */ 1258 * it is memset(0) for each process in procps_scan() */
1259 unsigned long vsz, rss; /* we round it to kbytes */ 1259 unsigned long vsz, rss; /* we round it to kbytes */
@@ -1309,7 +1309,7 @@ enum {
1309 || ENABLE_PIDOF 1309 || ENABLE_PIDOF
1310 || ENABLE_SESTATUS 1310 || ENABLE_SESTATUS
1311 ), 1311 ),
1312 USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) 1312 IF_SELINUX(PSSCAN_CONTEXT = 1 << 17,)
1313 PSSCAN_START_TIME = 1 << 18, 1313 PSSCAN_START_TIME = 1 << 18,
1314 PSSCAN_CPU = 1 << 19, 1314 PSSCAN_CPU = 1 << 19,
1315 /* These are all retrieved from proc/NN/stat in one go: */ 1315 /* These are all retrieved from proc/NN/stat in one go: */