aboutsummaryrefslogtreecommitdiffstats
path: root/tools/blktap2/include
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2009-06-24 15:24:53 +0100
committerKeir Fraser <keir.fraser@citrix.com>2009-06-24 15:24:53 +0100
commit1d998d8224dd7ac5b1f2a2175c3c050f27ae6f6b (patch)
tree63fe31e448b6093e62de875cff596823f738b065 /tools/blktap2/include
parenta61c4df7f669496dc21f26919f272b934048da6d (diff)
downloadxen-1d998d8224dd7ac5b1f2a2175c3c050f27ae6f6b.tar.gz
xen-1d998d8224dd7ac5b1f2a2175c3c050f27ae6f6b.tar.bz2
xen-1d998d8224dd7ac5b1f2a2175c3c050f27ae6f6b.zip
blktap2: A final few NetBSD fixes
Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
Diffstat (limited to 'tools/blktap2/include')
-rw-r--r--tools/blktap2/include/blk_uuid.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/tools/blktap2/include/blk_uuid.h b/tools/blktap2/include/blk_uuid.h
index 82922619e0..598ab2b661 100644
--- a/tools/blktap2/include/blk_uuid.h
+++ b/tools/blktap2/include/blk_uuid.h
@@ -45,7 +45,7 @@ static inline void blk_uuid_generate(blk_uuid_t *uuid)
uuid_generate(uuid->uuid);
}
-static inline void blk_uuid_to_string(blk_uuid_t *uuid, char *out)
+static inline void blk_uuid_to_string(blk_uuid_t *uuid, char *out, size_t size)
{
uuid_unparse(uuid->uuid, out);
}
@@ -74,6 +74,7 @@ static inline int blk_uuid_compare(blk_uuid_t *uuid1, blk_uuid_t *uuid2)
#include <uuid.h>
#include <string.h>
+#include <stdlib.h>
typedef uuid_t blk_uuid_t;
@@ -89,10 +90,13 @@ static inline void blk_uuid_generate(blk_uuid_t *uuid)
uuid_create((uuid_t *)uuid, &status);
}
-static inline void blk_uuid_to_string(blk_uuid_t *uuid, char *out)
+static inline void blk_uuid_to_string(blk_uuid_t *uuid, char *out, size_t size)
{
uint32_t status;
- uuid_to_string((uuid_t *)uuid, &out, &status);
+ char *_out = NULL;
+ uuid_to_string((uuid_t *)uuid, &_out, &status);
+ strlcpy(out, _out, size);
+ free(_out);
}
static inline void blk_uuid_from_string(blk_uuid_t *uuid, const char *in)