shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Fix warnings in daemons/common.

Browse Source
This commit is contained in:
Petr Rockai 2011-08-31 12:18:40 +00:00
parent d008fc86a0
commit 6e4e30827d
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemons/common/daemon-client.c
View File

@ -4,6 +4,7 @@
#include <sys/socket.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <assert.h>
#include <errno.h> // ENOMEM
@ -53,7 +54,7 @@ daemon_reply daemon_send(daemon_handle h, daemon_request rq)
void daemon_reply_destroy(daemon_reply r) {
if (r.cft)
destroy_config_tree(r.cft);
dm_config_destroy(r.cft);
}
daemon_reply daemon_send_simple(daemon_handle h, char *id, ...)

9
daemons/common/daemon-server.c
View File

@ -218,14 +218,14 @@ struct thread_baton {
client_handle client;
};
int buffer_rewrite(char **buf, const char *format, const char *string) {
static int buffer_rewrite(char **buf, const char *format, const char *string) {
char *old = *buf;
dm_asprintf(buf, format, *buf, string);
dm_free(old);
return 0;
}
int buffer_line(const char *line, void *baton) {
static int buffer_line(const char *line, void *baton) {
response *r = baton;
if (r->buffer)
buffer_rewrite(&r->buffer, "%s\n%s", line);
@ -234,7 +234,7 @@ int buffer_line(const char *line, void *baton) {
return 0;
}
void *client_thread(void *baton)
static void *client_thread(void *baton)
{
struct thread_baton *b = baton;
request req;
@ -266,7 +266,7 @@ fail:
return NULL;
}
int handle_connect(daemon_state s)
static int handle_connect(daemon_state s)
{
struct sockaddr_un sockaddr;
client_handle client;
@ -345,7 +345,6 @@ void daemon_start(daemon_state s)
s.daemon_init(&s);
while (!_shutdown_requested && !failed) {
int status;
fd_set in;
FD_ZERO(&in);
FD_SET(s.socket_fd, &in);

3
daemons/common/daemon-shared.c
View File

@ -2,6 +2,7 @@
#include <stdio.h>
#include <malloc.h>
#include <string.h>
#include <unistd.h>
#include <assert.h>
#include "daemon-shared.h"
@ -80,7 +81,7 @@ char *format_buffer(const char *what, const char *id, va_list ap)
dm_asprintf(&buffer, "%s = \"%s\"\n", what, id);
if (!buffer) goto fail;
while (next = va_arg(ap, char *)) {
while ((next = va_arg(ap, char *))) {
old = buffer;
assert(strchr(next, '='));
keylen = strchr(next, '=') - next;