Displaying 6 results from an estimated 6 matches for "blkid_without_p_i_opt".
2015 Jul 13
1
[PATCH] daemon: add a space after func name to fit code-style
...t;
---
daemon/blkid.c | 2 +-
daemon/btrfs.c | 28 ++++++++++++++--------------
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/daemon/blkid.c b/daemon/blkid.c
index 1ac42b4..74d2fa6 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -199,7 +199,7 @@ error:
}
static char **
-blkid_without_p_i_opt(const char *device)
+blkid_without_p_i_opt (const char *device)
{
char *s;
DECLARE_STRINGSBUF (ret);
diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index ee3464d..50b0ba8 100644
--- a/daemon/btrfs.c
+++ b/daemon/btrfs.c
@@ -876,7 +876,7 @@ btrfs_set_uuid (const char *device, const char *uuid)...
2016 Jul 07
0
[PATCH 2/2] daemon: fix cleanup of stringsbuf usages
...ored: %s", line);
}
}
- if (end_stringsbuf (&ret) == -1) goto error;
-
- return ret.argv;
-
- error:
- if (ret.argv)
- free_strings (ret.argv);
+ if (end_stringsbuf (&ret) == -1) return NULL;
- return NULL;
+ return take_stringsbuf (&ret);
}
static char **
blkid_without_p_i_opt (const char *device)
{
char *s;
- DECLARE_STRINGSBUF (ret);
+ CLEANUP_FREE_STRINGSBUF DECLARE_STRINGSBUF (ret);
- if (add_string (&ret, "TYPE") == -1) goto error;
+ if (add_string (&ret, "TYPE") == -1) return NULL;
s = get_blkid_tag (device, "TYPE"...
2016 Jul 07
2
[PATCH 1/2] daemon: free the string on stringsbuf add failure
If add_string_nodup fails free the passed string instead of leaking it,
as that string would have been owned by the stringbuf.
Adapt few places to this behaviour.
---
daemon/btrfs.c | 4 +---
daemon/devsparts.c | 8 ++++----
daemon/guestfsd.c | 1 +
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index 9b52aa8..d70565a 100644
---
2012 Mar 13
2
[PATCH 0/2] 'int' to 'size_t' changes
These two patches are probably not completely independent, but
separating them is a lot of work.
With *both* patches applied, all the tests and extra-tests pass.
That's no guarantee however that there isn't a mistake, so I don't
think this patch is a candidate for the 1.16 branch, until it's had a
lot more testing in development.
Rich.
2015 Oct 05
0
[PATCH 2/2] Fix whitespace.
...while (0)
diff --git a/daemon/blkid.c b/daemon/blkid.c
index 74d2fa6..99546b4 100644
--- a/daemon/blkid.c
+++ b/daemon/blkid.c
@@ -191,7 +191,7 @@ blkid_with_p_i_opt (const char *device)
return ret.argv;
-error:
+ error:
if (ret.argv)
free_strings (ret.argv);
@@ -225,7 +225,7 @@ blkid_without_p_i_opt (const char *device)
if (end_stringsbuf (&ret) == -1) goto error;
return ret.argv;
-error:
+ error:
if (ret.argv)
free_stringslen (ret.argv, ret.size);
return NULL;
diff --git a/daemon/btrfs.c b/daemon/btrfs.c
index 50b0ba8..ddb029d 100644
--- a/daemon/btrfs.c
+++ b/daemon/bt...
2015 Oct 05
3
[PATCH 1/2] Change 'fprintf (stdout,...)' -> printf.
Result of earlier copy and paste.
---
align/scan.c | 35 ++++++++++---------
cat/cat.c | 39 +++++++++++----------
cat/filesystems.c | 69 +++++++++++++++++++-------------------
cat/log.c | 35 ++++++++++---------
cat/ls.c | 61 +++++++++++++++++----------------
df/main.c | 43 ++++++++++++------------
diff/diff.c | 67