about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-07-30 06:11:16 -0400
committerRich Felker <dalias@aerifal.cx>2011-07-30 06:11:16 -0400
commit7683fceedebd98dda19b1a379b92406b64ce7f92 (patch)
tree3475f782f67197d626435855e932336a4473ce86 /src
parent7dd60b80f965af451f952b9f45bd9b6aec0fae74 (diff)
downloadmusl-7683fceedebd98dda19b1a379b92406b64ce7f92.tar.gz
musl-7683fceedebd98dda19b1a379b92406b64ce7f92.tar.xz
musl-7683fceedebd98dda19b1a379b92406b64ce7f92.zip
eliminate dependence of perror on printf
Diffstat (limited to 'src')
-rw-r--r--src/stdio/perror.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/stdio/perror.c b/src/stdio/perror.c
index e4637c8a..4349ac5e 100644
--- a/src/stdio/perror.c
+++ b/src/stdio/perror.c
@@ -5,23 +5,18 @@
 
 void perror(const char *msg)
 {
-#if 1
-	if (msg) fprintf(stderr, "%s: %m\n", msg, strerror(errno));
-	else fprintf(stderr, "%m\n");
-#else
 	FILE *f = stderr;
 	char *errstr = strerror(errno);
 
 	FLOCK(f);
 	
 	if (msg) {
-		__fwritex(msg, strlen(msg), f);
-		__putc_unlocked(':', f);
-		__putc_unlocked(' ', f);
+		fwrite(msg, strlen(msg), 1, f);
+		fputc(':', f);
+		fputc(' ', f);
 	}
-	__fwritex(errstr, strlen(errstr), f);
-	__putc_unlocked('\n', f);
+	fwrite(errstr, strlen(errstr), 1, f);
+	fputc('\n', f);
 
 	FUNLOCK(f);
-#endif
 }