From 86d261bdb5cb18665ecd656bf46e502744ce89f8 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 7 Sep 2008 14:08:37 +0200 Subject: removed fdprintf() and client_print() All callers of fdprintf() have been converted to client_printf() or fprintf(); it is time to remove this clumsy hack now. We can also remove client_print() which took a file descriptor as parameter. --- src/myfprintf.c | 63 --------------------------------------------------------- 1 file changed, 63 deletions(-) delete mode 100644 src/myfprintf.c (limited to 'src/myfprintf.c') diff --git a/src/myfprintf.c b/src/myfprintf.c deleted file mode 100644 index 00b02ebd3..000000000 --- a/src/myfprintf.c +++ /dev/null @@ -1,63 +0,0 @@ -/* the Music Player Daemon (MPD) - * Copyright (C) 2003-2007 by Warren Dukes (warren.dukes@gmail.com) - * This project's homepage is: http://www.musicpd.org - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "myfprintf.h" -#include "client.h" -#include "path.h" -#include "utils.h" -#include "os_compat.h" - -#define BUFFER_LENGTH MPD_PATH_MAX+1024 - -static void blockingWrite(const int fd, const char *string, size_t len) -{ - while (len) { - ssize_t ret = xwrite(fd, string, len); - if (ret == (ssize_t)len) - return; - if (ret >= 0) { - len -= ret; - string += ret; - continue; - } - return; /* error */ - } -} - -void vfdprintf(const int fd, const char *fmt, va_list args) -{ - static char buffer[BUFFER_LENGTH]; - char *buf = buffer; - size_t len; - - vsnprintf(buf, BUFFER_LENGTH, fmt, args); - len = strlen(buf); - if (fd == STDERR_FILENO || - fd == STDOUT_FILENO || - client_print(fd, buf, len) < 0) - blockingWrite(fd, buf, len); -} - -mpd_fprintf void fdprintf(const int fd, const char *fmt, ...) -{ - va_list args; - va_start(args, fmt); - vfdprintf(fd, fmt, args); - va_end(args); -} - -- cgit v1.2.3