From: Marek Polacek <mmpolacek@gmail.com>
Date: Sun, 12 Sep 2010 15:06:43 +0000 (+0200)
Subject: *: s/perror/bb_simple_perror_msg/g
X-Git-Tag: 1_18_0~214
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7dd61e377223d150198a23dbec47f51c21e10e65;p=oweals%2Fbusybox.git

*: s/perror/bb_simple_perror_msg/g

function                                             old     new   delta
readLines                                            448     446      -2
doCommands                                          2449    2438     -11
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-13)             Total: -13 bytes

Signed-off-by: Marek Polacek <mmpolacek@gmail.com>
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---

diff --git a/editors/ed.c b/editors/ed.c
index 516b8d78d..859668406 100644
--- a/editors/ed.c
+++ b/editors/ed.c
@@ -671,7 +671,7 @@ static int readLines(const char *file, int num)
 
 	fd = open(file, 0);
 	if (fd < 0) {
-		perror(file);
+		bb_simple_perror_msg(file);
 		return FALSE;
 	}
 
@@ -721,7 +721,7 @@ static int readLines(const char *file, int num)
 	} while (cc > 0);
 
 	if (cc < 0) {
-		perror(file);
+		bb_simple_perror_msg(file);
 		close(fd);
 		return FALSE;
 	}
@@ -761,7 +761,7 @@ static int writeLines(const char *file, int num1, int num2)
 
 	fd = creat(file, 0666);
 	if (fd < 0) {
-		perror(file);
+		bb_simple_perror_msg(file);
 		return FALSE;
 	}
 
@@ -776,7 +776,7 @@ static int writeLines(const char *file, int num1, int num2)
 
 	while (num1++ <= num2) {
 		if (full_write(fd, lp->data, lp->len) != lp->len) {
-			perror(file);
+			bb_simple_perror_msg(file);
 			close(fd);
 			return FALSE;
 		}
@@ -786,7 +786,7 @@ static int writeLines(const char *file, int num1, int num2)
 	}
 
 	if (close(fd) < 0) {
-		perror(file);
+		bb_simple_perror_msg(file);
 		return FALSE;
 	}
 
diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c
index 7228954d6..2b34954c0 100644
--- a/modutils/modutils-24.c
+++ b/modutils/modutils-24.c
@@ -3561,7 +3561,7 @@ static void check_tainted_module(struct obj_file *f, const char *m_name)
 		else if (errno == EACCES)
 			kernel_has_tainted = 1;
 		else {
-			perror(TAINT_FILENAME);
+			bb_simple_perror_msg(TAINT_FILENAME);
 			kernel_has_tainted = 0;
 		}
 	}