traceroute: fix help text to not show -6 when traceroute6 is off

[oweals/busybox.git] / editors / ed.c

diff --git a/editors/ed.c b/editors/ed.c
index 0961cc38eaf18aa6035acb73b82f7cb07ac12225..9ce8bead109565a08e2aed038235797a99598551 100644 (file)
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -89,7 +89,7 @@ static char *skip_blank(const char *cp)
 
 
 int ed_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int ed_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int ed_main(int argc UNUSED_PARAM, char **argv)
 {
        INIT_G();
 
@@ -456,7 +456,7 @@ static void subCommand(const char *cmd, int num1, int num2)
                 */
                nlp = malloc(sizeof(LINE) + lp->len + deltaLen);
                if (nlp == NULL) {
-                       bb_error_msg("cannot get memory for line");
+                       bb_error_msg("can't get memory for line");
                        return;
                }
 
@@ -686,7 +686,7 @@ static int readLines(const char *file, int num)
        cc = 0;
 
        printf("\"%s\", ", file);
-       fflush(stdout);
+       fflush_all();
 
        do {
                cp = memchr(bufPtr, '\n', bufUsed);
@@ -775,7 +775,7 @@ static int writeLines(const char *file, int num1, int num2)
        }
 
        printf("\"%s\", ", file);
-       fflush(stdout);
+       fflush_all();
 
        lp = findLine(num1);
        if (lp == NULL) {
@@ -951,7 +951,7 @@ static void deleteLines(int num1, int num2)
  * Returns the line number which matches, or 0 if there was no match
  * with an error printed.
  */
-static int searchLines(const char *str, int num1, int num2)
+static NOINLINE int searchLines(const char *str, int num1, int num2)
 {
        const LINE *lp;
        int len;
@@ -983,7 +983,7 @@ static int searchLines(const char *str, int num1, int num2)
                lp = lp->next;
        }
 
-       bb_error_msg("cannot find string \"%s\"", str);
+       bb_error_msg("can't find string \"%s\"", str);
        return 0;
 }