oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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.
This commit is contained in:
Max Kellermann 2008-09-07 14:08:37 +02:00
parent 322e908893
commit 86d261bdb5
5 changed files with 0 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -61,7 +61,6 @@ mpd_headers = \
ls.h \
main_notify.h \
mpd_types.h \
myfprintf.h \
normalize.h \
compress.h \
os_compat.h \
@ -130,7 +129,6 @@ mpd_SOURCES = \
ls.c \
main.c \
main_notify.c \
myfprintf.c \
normalize.c \
compress.c \
outputBuffer.c \

25
src/client.c
View File

@ -671,31 +671,6 @@ static void client_write_deferred(struct client *client)
}
}
static struct client *client_by_fd(int fd)
{
struct client *client;
list_for_each_entry(client, &clients, siblings)
if (client->fd == fd)
return client;
return NULL;
}
int client_print(int fd, const char *buffer, size_t buflen)
{
struct client *client;
assert(fd >= 0);
client = client_by_fd(fd);
if (client == NULL)
return -1;
client_write(client, buffer, buflen);
return 0;
}
static void client_defer_output(struct client *client,
const void *data, size_t length)
{

2
src/client.h
View File

@ -53,6 +53,4 @@ void client_vprintf(struct client *client, const char *fmt, va_list args);
*/
mpd_fprintf void client_printf(struct client *client, const char *fmt, ...);
int client_print(int fd, const char *buffer, size_t len);
#endif

63
src/myfprintf.c
View File

@ -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);
}

28
src/myfprintf.h
View File

@ -1,28 +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
*/
#ifndef MYFPRINTF_H
#define MYFPRINTF_H
#include "gcc.h"
#include "os_compat.h"
mpd_fprintf void fdprintf(const int fd, const char *fmt, ...);
void vfdprintf(const int fd, const char *fmt, va_list arglist);
#endif