[msitools: 11/16] wixl: remove libuuid usage
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools: 11/16] wixl: remove libuuid usage
- Date: Sun, 29 Mar 2020 01:09:24 +0000 (UTC)
commit 1ccada07be430c7f32ffea53bf50850dd18a2b74
Author: Marc-André Lureau <marcandre lureau redhat com>
Date: Sun Mar 29 00:58:55 2020 +0100
wixl: remove libuuid usage
Signed-off-by: Marc-André Lureau <marcandre lureau redhat com>
tools/wixl/util.vala | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
---
diff --git a/tools/wixl/util.vala b/tools/wixl/util.vala
index 491123a..689b284 100644
--- a/tools/wixl/util.vala
+++ b/tools/wixl/util.vala
@@ -5,24 +5,6 @@ namespace Wixl {
FIXME,
}
- namespace UUID {
- [CCode (cname = "uuid_generate", cheader_filename = "uuid/uuid.h")]
- internal extern static void generate ([CCode (array_length = false)] uchar[] uuid);
- [CCode (cname = "uuid_unparse", cheader_filename = "uuid/uuid.h")]
- internal extern static void unparse ([CCode (array_length = false)] uchar[] uuid,
- [CCode (array_length = false)] uchar[] output);
- }
-
- public string uuid_generate () {
- var udn = new uchar[50];
- var id = new uchar[16];
-
- UUID.generate (id);
- UUID.unparse (id, udn);
-
- return (string) udn;
- }
-
public G enum_from_string<G> (string str) throws GLib.Error {
var k = (EnumClass)typeof(G).class_ref ();
var v = k.get_value_by_nick (str);
@@ -45,7 +27,7 @@ namespace Wixl {
public string get_uuid (owned string uuid) throws GLib.Error {
if (uuid == "*")
- uuid = uuid_generate ();
+ uuid = Uuid.string_random ();
uuid = add_braces (uuid);
uuid = uuid.up ();
// FIXME: validate
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]