From: Cedric Le Goater <clg@fr.ibm.com>
Date: Wed, 13 Jan 2010 17:51:15 +0000 (+0100)
Subject: fix lxc_file_cb prototype
X-Git-Tag: lxc-0.6.5~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a7ff0c6fb427beb77046c60eb302bbdab0d5603;p=thirdparty%2Flxc.git

fix lxc_file_cb prototype

Signed-off-by: Cedric Le Goater <clg@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/conf.c b/src/lxc/conf.c
index df6068841..d3a1065e1 100644
--- a/src/lxc/conf.c
+++ b/src/lxc/conf.c
@@ -113,7 +113,7 @@ static struct mount_opt mount_opt[] = {
 	{ NULL,         0, 0              },
 };
 
-static int configure_find_fstype_cb(void* buffer, void *data)
+static int configure_find_fstype_cb(char* buffer, void *data)
 {
 	struct cbarg {
 		const char *rootfs;
@@ -338,7 +338,7 @@ static int setup_tty(const char *rootfs, const struct lxc_tty_info *tty_info)
 	return 0;
 }
 
-static int setup_rootfs_pivot_root_cb(void *buffer, void *data)
+static int setup_rootfs_pivot_root_cb(char *buffer, void *data)
 {
 	struct lxc_list	*mountlist, *listentry, *iterator;
 	char *pivotdir, *mountpoint, *mountentry;
diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 6e15d0902..9dd33c06a 100644
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -620,7 +620,7 @@ static int config_utsname(const char *key, char *value, struct lxc_conf *lxc_con
 	return 0;
 }
 
-static int parse_line(void *buffer, void *data)
+static int parse_line(char *buffer, void *data)
 {
 	struct config *config;
 	char *line = buffer;
diff --git a/src/lxc/parse.h b/src/lxc/parse.h
index a1ccceaa3..94b886ebd 100644
--- a/src/lxc/parse.h
+++ b/src/lxc/parse.h
@@ -26,7 +26,7 @@
 typedef int (*lxc_dir_cb)(const char *name, const char *directory,
 			  const char *file, void *data);
 
-typedef int (*lxc_file_cb)(void *buffer, void *data);
+typedef int (*lxc_file_cb)(char *buffer, void *data);
 
 extern int lxc_dir_for_each(const char *name, const char *directory,
 			    lxc_dir_cb callback, void *data);