[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH 05/24] tests: utils: Don't calculate file size in virTestLoadFile



The callers don't use it so don't waste a strlen(). Also fix the comment
for the function.
---
 tests/testutils.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/testutils.c b/tests/testutils.c
index ed01136a0..7f1c4672b 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -289,9 +289,17 @@ virTestRun(const char *title,
     return ret;
 }

-/* Allocate BUF to the size of FILE. Read FILE into buffer BUF.
-   Upon any failure, diagnose it and return -1, but don't bother trying
-   to preserve errno. Otherwise, return the number of bytes copied into BUF. */
+
+/**
+ * virTestLoadFile:
+ * @file: name of the file to load
+ * @buf: buffer to load the file into
+ *
+ * Allocates @buf to the size of FILE. Reads FILE into buffer BUF.
+ * Upon any failure, error is printed to stderr and -1 is returned. 'errno' is
+ * not preserved. On success 0 is returned. Caller is responsible for freeing
+ * @buf.
+ */
 int
 virTestLoadFile(const char *file, char **buf)
 {
@@ -345,7 +353,7 @@ virTestLoadFile(const char *file, char **buf)
     }

     VIR_FORCE_FCLOSE(fp);
-    return strlen(*buf);
+    return 0;
 }

 #ifndef WIN32
-- 
2.13.2


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]