summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Decotigny2017-01-20 19:29:22 +0100
committerMichael Brown2017-01-22 14:45:00 +0100
commit04c7befa730b3a6bfed069d3c6f6539bddb0ee52 (patch)
tree16d17add75fe68138fc9c83777cd053df8f59c1c
parent[virtio] Remove queue size limit in legacy virtio (diff)
downloadipxe-04c7befa730b3a6bfed069d3c6f6539bddb0ee52.tar.gz
ipxe-04c7befa730b3a6bfed069d3c6f6539bddb0ee52.tar.xz
ipxe-04c7befa730b3a6bfed069d3c6f6539bddb0ee52.zip
[build] Return const char * from uuid_ntoa()
Signed-off-by: Michael Brown <mcb30@ipxe.org>
-rw-r--r--src/core/uuid.c2
-rw-r--r--src/include/ipxe/uuid.h2
-rw-r--r--src/net/peerdisc.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/core/uuid.c b/src/core/uuid.c
index b8d21de1..c43d4216 100644
--- a/src/core/uuid.c
+++ b/src/core/uuid.c
@@ -40,7 +40,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
* @v uuid UUID
* @ret string UUID in canonical form
*/
-char * uuid_ntoa ( const union uuid *uuid ) {
+const char * uuid_ntoa ( const union uuid *uuid ) {
static char buf[37]; /* "00000000-0000-0000-0000-000000000000" */
sprintf ( buf, "%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x",
diff --git a/src/include/ipxe/uuid.h b/src/include/ipxe/uuid.h
index 6c45eb9a..24c46aca 100644
--- a/src/include/ipxe/uuid.h
+++ b/src/include/ipxe/uuid.h
@@ -47,6 +47,6 @@ static inline void uuid_mangle ( union uuid *uuid ) {
__bswap_16s ( &uuid->canonical.c );
}
-extern char * uuid_ntoa ( const union uuid *uuid );
+extern const char * uuid_ntoa ( const union uuid *uuid );
#endif /* _IPXE_UUID_H */
diff --git a/src/net/peerdisc.c b/src/net/peerdisc.c
index 5b0e9891..4c3cd2ea 100644
--- a/src/net/peerdisc.c
+++ b/src/net/peerdisc.c
@@ -408,7 +408,7 @@ static struct peerdisc_segment * peerdisc_create ( const char *id ) {
} random_uuid;
size_t uuid_len;
size_t id_len;
- char *uuid;
+ const char *uuid;
char *uuid_copy;
char *id_copy;
unsigned int i;