Module Name: src
Committed By: jnemeth
Date: Wed Oct 1 01:07:24 UTC 2014
Modified Files:
src/sbin/gpt: gpt_uuid.c
Log Message:
actually return the uuid when parsing one that is in numeric format
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sbin/gpt/gpt_uuid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/gpt_uuid.c
diff -u src/sbin/gpt/gpt_uuid.c:1.2 src/sbin/gpt/gpt_uuid.c:1.3
--- src/sbin/gpt/gpt_uuid.c:1.2 Tue Sep 30 22:56:36 2014
+++ src/sbin/gpt/gpt_uuid.c Wed Oct 1 01:07:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: gpt_uuid.c,v 1.2 2014/09/30 22:56:36 jnemeth Exp $ */
+/* $NetBSD: gpt_uuid.c,v 1.3 2014/10/01 01:07:24 jnemeth Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include <sys/cdefs.h>
#ifdef __RCSID
-__RCSID("$NetBSD: gpt_uuid.c,v 1.2 2014/09/30 22:56:36 jnemeth Exp $");
+__RCSID("$NetBSD: gpt_uuid.c,v 1.3 2014/10/01 01:07:24 jnemeth Exp $");
#endif
#include <stdio.h>
@@ -211,8 +211,10 @@ gpt_uuid_parse(const char *s, gpt_uuid_t
{
struct dce_uuid u;
- if (gpt_uuid_parse_numeric(s, &u) != -1)
+ if (gpt_uuid_parse_numeric(s, &u) != -1) {
+ gpt_dce_to_uuid(&u, uuid);
return 0;
+ }
if (gpt_uuid_parse_symbolic(s, &u) == -1)
return -1;
