narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[build] Return const char * from uuid_ntoa() 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
pull/58/merge
David Decotigny 2017-01-20 10:29:22 -08:00 committed by Michael Brown
parent fba3b39900
commit 04c7befa73
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/uuid.c
View File

@ -40,7 +40,7 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
* @v uuid UUID * @v uuid UUID
* @ret string UUID in canonical form * @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" */ static char buf[37]; /* "00000000-0000-0000-0000-000000000000" */
sprintf ( buf, "%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x", sprintf ( buf, "%08x-%04x-%04x-%04x-%02x%02x%02x%02x%02x%02x",

2
src/include/ipxe/uuid.h
View File

@ -47,6 +47,6 @@ static inline void uuid_mangle ( union uuid *uuid ) {
__bswap_16s ( &uuid->canonical.c ); __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 */ #endif /* _IPXE_UUID_H */

2
src/net/peerdisc.c
View File

@ -408,7 +408,7 @@ static struct peerdisc_segment * peerdisc_create ( const char *id ) {
} random_uuid; } random_uuid;
size_t uuid_len; size_t uuid_len;
size_t id_len; size_t id_len;
char *uuid; const char *uuid;
char *uuid_copy; char *uuid_copy;
char *id_copy; char *id_copy;
unsigned int i; unsigned int i;