Merge branch 'busybox' into merge

4 files changed, 1 insertions, 5 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 06857ed61..e75257a74 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -131,7 +131,7 @@ void FAST_FUNC bb_show_usage(void)
                         full_write2_str(applet_name);
                         full_write2_str(" ");
                         full_write2_str(p);
-                        full_write2_str("\n\n");
+                        full_write2_str("\n");
                 }
                 if (ENABLE_FEATURE_CLEAN_UP)
                         dealloc_usage_messages((char*)usage_string);
@@ -462,7 +462,6 @@ static void parse_config_file(void)
                         errmsg = "keyword outside section";
                         goto pe_label;
                 }
-
         } /* while (1) */
 
  pe_label:
diff --git a/libbb/in_ether.c b/libbb/in_ether.c
index 1de383bde..161c8ea3c 100644
--- a/libbb/in_ether.c
+++ b/libbb/in_ether.c
@@ -51,7 +51,6 @@ int FAST_FUNC in_ether(const char *bufp, struct sockaddr *sap)
                 } while (j);
 
                 *ptr++ = val;
-
         } while (--i);
 
         /* Error if we aren't at end of string */
diff --git a/libbb/procps.c b/libbb/procps.c
index fff9f8b0b..b597b74f9 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -615,7 +615,6 @@ void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
                         buf[comm_len - 1] = ' ';
                         buf[col - 1] = '\0';
                 }
-
         } else {
                 snprintf(buf, col, "[%s]", comm);
         }
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index f25ce9446..0c9969640 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -207,7 +207,6 @@ off_t FAST_FUNC fdlength(int fd)
                         else bottom = pos;
 
                 // If we can't, it's smaller.
-
                 } else {
                         if (bottom == top) {
                                 if (!top) return 0;