diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 11:09:40 +0000 |
| commit | 5e34ff29bcc870936ab18172f438a34d042d4e03 (patch) | |
| tree | a5e7a528f2f916eb883f1161eadceacdf2dca4be /libbb/lineedit.c | |
| parent | 8b814b4a349e2262c0ad25793b05206a14651ebb (diff) | |
| download | busybox-5e34ff29bcc870936ab18172f438a34d042d4e03.tar.gz | |
*: 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 'libbb/lineedit.c')
| -rw-r--r-- | libbb/lineedit.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libbb/lineedit.c b/libbb/lineedit.c index 7bcdb954c..e0ab73250 100644 --- a/libbb/lineedit.c +++ b/libbb/lineedit.c @@ -62,10 +62,10 @@ #define ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR \ (ENABLE_FEATURE_USERNAME_COMPLETION || ENABLE_FEATURE_EDITING_FANCY_PROMPT) -#define USE_FEATURE_GETUSERNAME_AND_HOMEDIR(...) +#define IF_FEATURE_GETUSERNAME_AND_HOMEDIR(...) #if ENABLE_FEATURE_GETUSERNAME_AND_HOMEDIR -#undef USE_FEATURE_GETUSERNAME_AND_HOMEDIR -#define USE_FEATURE_GETUSERNAME_AND_HOMEDIR(...) __VA_ARGS__ +#undef IF_FEATURE_GETUSERNAME_AND_HOMEDIR +#define IF_FEATURE_GETUSERNAME_AND_HOMEDIR(...) __VA_ARGS__ #endif enum { @@ -152,8 +152,8 @@ extern struct lineedit_statics *const lineedit_ptr_to_statics; (*(struct lineedit_statics**)&lineedit_ptr_to_statics) = xzalloc(sizeof(S)); \ barrier(); \ cmdedit_termw = 80; \ - USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \ - USE_FEATURE_GETUSERNAME_AND_HOMEDIR(home_pwd_buf = (char*)null_str;) \ + IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \ + IF_FEATURE_GETUSERNAME_AND_HOMEDIR(home_pwd_buf = (char*)null_str;) \ } while (0) static void deinit_S(void) { @@ -1160,7 +1160,7 @@ static void remember_in_history(char *str) if ((state->flags & SAVE_HISTORY) && state->hist_file) save_history(str); #endif - USE_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;) + IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines++;) } #else /* MAX_HISTORY == 0 */ @@ -1442,7 +1442,7 @@ static void win_changed(int nsig) /* leave out the "vi-mode"-only case labels if vi editing isn't * configured. */ -#define vi_case(caselabel) USE_FEATURE_EDITING(case caselabel) +#define vi_case(caselabel) IF_FEATURE_EDITING(case caselabel) /* convert uppercase ascii to equivalent control char, for readability */ #undef CTRL |