From: Michel Normand <normand@fr.ibm.com>
Date: Thu, 14 May 2009 13:23:30 +0000 (+0200)
Subject: add error log in lxc_file_for_each_line
X-Git-Tag: lxc_0_6_3~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2e714984224cab00d2d420b820dcc013cea0dfb8;p=thirdparty%2Flxc.git

add error log in lxc_file_for_each_line

this is required to log error where needed
and to to avoid additionnal log later on.

Signed-off-by: Michel Normand <normand@fr.ibm.com>
Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/parse.c b/src/lxc/parse.c
index 9eafe27f4..5cd8470ef 100644
--- a/src/lxc/parse.c
+++ b/src/lxc/parse.c
@@ -64,7 +64,7 @@ int lxc_dir_for_each(const char *name, const char *directory,
 }
 
 int lxc_file_for_each_line(const char *file, lxc_file_cb callback,
-			   void *buffer, size_t len, void* data)
+			   char *buffer, size_t len, void* data)
 {
 	FILE *f;
 	int err = -1;
@@ -77,8 +77,10 @@ int lxc_file_for_each_line(const char *file, lxc_file_cb callback,
 
 	while (fgets(buffer, len, f)) {
 		err = callback(buffer, data);
-		if (err)
+		if (err) {
+			ERROR("failed to process '%s'", buffer);
 			goto out;
+		}
 	}
 out:
 	fclose(f);
diff --git a/src/lxc/parse.h b/src/lxc/parse.h
index 2713c0794..a1ccceaa3 100644
--- a/src/lxc/parse.h
+++ b/src/lxc/parse.h
@@ -32,7 +32,7 @@ extern int lxc_dir_for_each(const char *name, const char *directory,
 			    lxc_dir_cb callback, void *data);
 
 extern int lxc_file_for_each_line(const char *file, lxc_file_cb callback,
-				  void *buffer, size_t len, void* data);
+				  char *buffer, size_t len, void* data);
 
 extern int lxc_char_left_gc(char *buffer, size_t len);