NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

In src/util.c, virLog is just a wrapper around fprintf(stderr). Make sure to

Browse Source 
put line breaks at the end of lines that use virLog() (noticed during testing).

Signed-off-by: Chris Lalancette <clalance@redhat.com>
This commit is contained in:
Chris Lalancette 2008-06-17 12:45:59 +00:00
parent a75a612ad5
commit a9e30eec59
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/util.c
View File

@ -341,20 +341,20 @@ int __virFileReadAll(const char *path, int maxlen, char **buf)
char *s; char *s;
if (!(fh = fopen(path, "r"))) { if (!(fh = fopen(path, "r"))) {
virLog("Failed to open file '%s': %s", virLog("Failed to open file '%s': %s\n",
path, strerror(errno)); path, strerror(errno));
goto error; goto error;
} }
s = fread_file_lim(fh, maxlen+1, &len); s = fread_file_lim(fh, maxlen+1, &len);
if (s == NULL) { if (s == NULL) {
virLog("Failed to read '%s': %s", path, strerror (errno)); virLog("Failed to read '%s': %s\n", path, strerror (errno));
goto error; goto error;
} }
if (len > maxlen || (int)len != len) { if (len > maxlen || (int)len != len) {
VIR_FREE(s); VIR_FREE(s);
virLog("File '%s' is too large %d, max %d", virLog("File '%s' is too large %d, max %d\n",
path, (int)len, maxlen); path, (int)len, maxlen);
goto error; goto error;
} }
@ -415,16 +415,16 @@ int virFileLinkPointsTo(const char *checkLink,
return 0; return 0;
case EINVAL: case EINVAL:
virLog("File '%s' is not a symlink", virLog("File '%s' is not a symlink\n",
checkLink); checkLink);
return 0; return 0;
} }
virLog("Failed to read symlink '%s': %s", virLog("Failed to read symlink '%s': %s\n",
checkLink, strerror(errno)); checkLink, strerror(errno));
return 0; return 0;
} else if (n >= PATH_MAX) { } else if (n >= PATH_MAX) {
virLog("Symlink '%s' contents too long to fit in buffer", virLog("Symlink '%s' contents too long to fit in buffer\n",
checkLink); checkLink);
return 0; return 0;
} }
@ -441,7 +441,7 @@ int virFileLinkPointsTo(const char *checkLink,
dir[PATH_MAX-1] = '\0'; dir[PATH_MAX-1] = '\0';
if (!(p = strrchr(dir, '/'))) { if (!(p = strrchr(dir, '/'))) {
virLog("Symlink path '%s' is not absolute", checkLink); virLog("Symlink path '%s' is not absolute\n", checkLink);
return 0; return 0;
} }
@ -451,7 +451,7 @@ int virFileLinkPointsTo(const char *checkLink,
*p = '\0'; *p = '\0';
if (virFileBuildPath(dir, dest, NULL, tmp, PATH_MAX) < 0) { if (virFileBuildPath(dir, dest, NULL, tmp, PATH_MAX) < 0) {
virLog("Path '%s/%s' is too long", dir, dest); virLog("Path '%s/%s' is too long\n", dir, dest);
return 0; return 0;
} }
@ -461,20 +461,20 @@ int virFileLinkPointsTo(const char *checkLink,
/* canonicalize both paths */ /* canonicalize both paths */
if (!realpath(dest, real)) { if (!realpath(dest, real)) {
virLog("Failed to expand path '%s' :%s", dest, strerror(errno)); virLog("Failed to expand path '%s' :%s\n", dest, strerror(errno));
strncpy(real, dest, PATH_MAX); strncpy(real, dest, PATH_MAX);
real[PATH_MAX-1] = '\0'; real[PATH_MAX-1] = '\0';
} }
if (!realpath(checkDest, checkReal)) { if (!realpath(checkDest, checkReal)) {
virLog("Failed to expand path '%s' :%s", checkDest, strerror(errno)); virLog("Failed to expand path '%s' :%s\n", checkDest, strerror(errno));
strncpy(checkReal, checkDest, PATH_MAX); strncpy(checkReal, checkDest, PATH_MAX);
checkReal[PATH_MAX-1] = '\0'; checkReal[PATH_MAX-1] = '\0';
} }
/* compare */ /* compare */
if (STRNEQ(checkReal, real)) { if (STRNEQ(checkReal, real)) {
virLog("Link '%s' does not point to '%s', ignoring", virLog("Link '%s' does not point to '%s', ignoring\n",
checkLink, checkReal); checkLink, checkReal);
return 0; return 0;
} }
@ -492,7 +492,7 @@ int
virFileLinkPointsTo (const char *checkLink ATTRIBUTE_UNUSED, virFileLinkPointsTo (const char *checkLink ATTRIBUTE_UNUSED,
const char *checkDest ATTRIBUTE_UNUSED) const char *checkDest ATTRIBUTE_UNUSED)
{ {
virLog (_("%s: not implemented"), __FUNCTION__); virLog (_("%s: not implemented\n"), __FUNCTION__);
return 0; return 0;
} }