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

client: replace "expired" flag with fd==-1

Browse Source 
Why waste 4 bytes for a flag which we can hide in another variable.
This commit is contained in:
Max Kellermann 2008-08-28 20:20:10 +02:00
parent bdeb8e148e
commit 4e17ab11a8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/client.c
View File

@ -66,7 +66,7 @@ struct client {
char buffer[CLIENT_MAX_BUFFER_LENGTH]; char buffer[CLIENT_MAX_BUFFER_LENGTH];
size_t bufferLength; size_t bufferLength;
size_t bufferPos; size_t bufferPos;
int fd; /* file descriptor */ int fd; /* file descriptor; -1 if expired */
int permission; int permission;
time_t lastTime; time_t lastTime;
struct strnode *cmd_list; /* for when in list mode */ struct strnode *cmd_list; /* for when in list mode */
@ -76,8 +76,6 @@ struct client {
int cmd_list_dup; /* has the cmd_list been copied to private space? */ int cmd_list_dup; /* has the cmd_list been copied to private space? */
struct sllnode *deferred_send; /* for output if client is slow */ struct sllnode *deferred_send; /* for output if client is slow */
size_t deferred_bytes; /* mem deferred_send consumes */ size_t deferred_bytes; /* mem deferred_send consumes */
int expired; /* set whether this client should be closed on next
check of old clients */
unsigned int num; /* client number */ unsigned int num; /* client number */
char *send_buf; char *send_buf;
@ -133,12 +131,15 @@ static void set_send_buf_size(struct client *client)
static inline int client_is_expired(const struct client *client) static inline int client_is_expired(const struct client *client)
{ {
return client->expired; return client->fd < 0;
} }
static inline void client_set_expired(struct client *client) static inline void client_set_expired(struct client *client)
{ {
client->expired = 1; if (client->fd >= 0) {
xclose(client->fd);
client->fd = -1;
}
} }
static void client_init(struct client *client, int fd) static void client_init(struct client *client, int fd)
@ -156,7 +157,6 @@ static void client_init(struct client *client, int fd)
client->cmd_list = NULL; client->cmd_list = NULL;
client->cmd_list_tail = NULL; client->cmd_list_tail = NULL;
client->deferred_send = NULL; client->deferred_send = NULL;
client->expired = 0;
client->deferred_bytes = 0; client->deferred_bytes = 0;
client->num = next_client_num++; client->num = next_client_num++;
client->send_buf_used = 0; client->send_buf_used = 0;