[gentoo-commits] proj/sandbox:master commit in: libsbutil/

[Mike Frysinger]

commit:     a60b397d75e121232b8066db7333b82a6f9a951c
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 20 01:11:13 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Dec 20 01:11:13 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=a60b397d

sb_efuncs: avoid pointless stdio indirection

We were setting up a FILE* from a file descriptor to pass to sb_fprintf
which is a simple macro that calls fileno(fp) to pass the fd down.  We
can call the fd funcs directly and avoid the whole stdio business.

Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>

 libsbutil/sb_efuncs.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/libsbutil/sb_efuncs.c b/libsbutil/sb_efuncs.c
index c855257..2de3116 100644
--- a/libsbutil/sb_efuncs.c
+++ b/libsbutil/sb_efuncs.c
@@ -35,8 +35,8 @@ static void sbio_init(void)
  */
 static void sb_vefunc(const char *prog, const char *color, const char *format, va_list args)
 {
+	bool opened;
 	int fd;
-	FILE *fp;
 
 	if (likely(sbio_message_path))
 		fd = sbio_open(sbio_message_path, O_WRONLY|O_APPEND|O_CLOEXEC, 0);
@@ -44,15 +44,15 @@ static void sb_vefunc(const char *prog, const char *color, const char *format, v
 		fd = -1;
 	if (fd == -1)
 		fd = sbio_open(sbio_fallback_path, O_WRONLY|O_CLOEXEC, 0);
-	fp = fd == -1 ? NULL : fdopen(fd, "ae");
-	if (!fp)
-		fp = stderr;
+	opened = (fd != -1);
+	if (fd == -1)
+		fd = fileno(stderr);
 
-	sb_fprintf(fp, " %s*%s ", color, COLOR_NORMAL);
-	sb_vfprintf(fp, format, args);
+	sb_fdprintf(fd, " %s*%s ", color, COLOR_NORMAL);
+	sb_vfdprintf(fd, format, args);
 
-	if (fp != stderr)
-		fclose(fp);
+	if (opened)
+		close(fd);
 }
 
 void sb_einfo(const char *format, ...)