]> git.ipfire.org Git - thirdparty/lxc.git/commitdiff
add error log in lxc_file_for_each_line
authorMichel Normand <normand@fr.ibm.com>
Thu, 14 May 2009 13:23:30 +0000 (15:23 +0200)
committerDaniel Lezcano <dlezcano@fr.ibm.com>
Thu, 14 May 2009 13:23:30 +0000 (15:23 +0200)
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>
src/lxc/parse.c
src/lxc/parse.h

index 9eafe27f4e1cfbf883f2a9499fb82cbdd16a4340..5cd8470ef14d08a758b94b4d412cd4f49e2e2316 100644 (file)
@@ -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);
index 2713c0794cedd6820f4b7e70bd4d2c9371360c6b..a1ccceaa36c5e804233be7ae6df1c28aea538eb3 100644 (file)
@@ -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);