From f41751a60d4e3b884ecc785a3b1c34cbd5fbd69e Mon Sep 17 00:00:00 2001
From: aldot <aldot@69ca8d6d-28ef-0310-b511-8ec308f3f277>
Date: Fri, 19 May 2006 12:38:30 +0000
Subject: - remove superfluous legacy includes. This applet should be converted
to use llist; __NEED_DLLIST
git-svn-id: svn://busybox.net/trunk/busybox@15126 69ca8d6d-28ef-0310-b511-8ec308f3f277
---
editors/ed.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/editors/ed.c b/editors/ed.c
index 0414bfc9d..1ff93c2bb 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
/*
* Copyright (c) 2002 by David I. Bell
* Permission is granted to use, distribute, or modify this source,
@@ -11,11 +12,9 @@
#include <unistd.h>
#include <fcntl.h>
#include <string.h>
-#include <memory.h>
#include <time.h>
#include <ctype.h>
#include <sys/param.h>
-#include <malloc.h>
#include "busybox.h"
#define USERSIZE 1024 /* max line length typed in by user */
@@ -321,7 +320,7 @@ static void doCommands(void)
bb_error_msg("No file name specified");
break;
}
-
+
writeLines(cp, num1, num2);
break;
@@ -349,7 +348,7 @@ static void doCommands(void)
printLines(curNum, curNum, FALSE);
break;
-
+
case '-':
if (setCurNum(curNum - 1))
printLines(curNum, curNum, FALSE);
@@ -672,7 +671,7 @@ static void addLines(int num)
/*
* Parse a line number argument if it is present. This is a sum
* or difference of numbers, '.', '$', 'x, or a search string.
- * Returns TRUE if successful (whether or not there was a number).
+ * Returns TRUE if successful (whether or not there was a number).
* Returns FALSE if there was a parsing error, with a message output.
* Whether there was a number is returned indirectly, as is the number.
* The character pointer which stopped the scan is also returned.
@@ -1141,7 +1140,7 @@ static int insertLine(int num, const char * data, int len)
newLp = (LINE *) malloc(sizeof(LINE) + len - 1);
- if (newLp == NULL)
+ if (newLp == NULL)
{
bb_error_msg("Failed to allocate memory for line");
--
cgit v1.2.3-55-g6feb