Merge a bunch of trivial changes from HEAD. The difference remaining

[gd/samba/.git] / source3 / lib / util_uuid.c

diff --git a/source3/lib/util_uuid.c b/source3/lib/util_uuid.c
index 1543094d4087b144f295b28f7380052283233b89..699f2cd632599dcc49491727a01b5a16493dd258 100644 (file)
--- a/source3/lib/util_uuid.c
+++ b/source3/lib/util_uuid.c
@@ -71,7 +71,7 @@ void uuid_generate_random(GUID *out)
        uuid_pack(&uu, out);
 }
 
-char *uuid_to_string(const GUID in)
+char *guid_to_string(const GUID in)
 {
        struct uuid uu;
        char *out;