ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mkswap: fix signedness problems and remove obsolete code 

The UUID is unsigned char *

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2007-07-25 16:55:25 +02:00
parent 8dbfe5a1fe
commit f88c89db4f
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
disk-utils/mkswap.c
View File

@ -195,28 +195,8 @@ write_signature(char *sig) {
strncpy(sp+pagesize-10, sig, 10);
}
#if 0
static int
tohex(int a) {
return ((a < 10) ? '0'+a : 'a'+a-10);
}
static void
uuid_unparse(unsigned char *uuid, char *s) {
int i;
for (i=0; i<16; i++) {
if (i == 4 || i == 6 || i == 8 || i == 10)
*s++ = '-';
*s++ = tohex((uuid[i] >> 4) & 0xf);
*s++ = tohex(uuid[i] & 0xf);
}
*s = 0;
}
#endif
static void
write_uuid_and_label(char *uuid, char *volume_name) {
write_uuid_and_label(unsigned char *uuid, char *volume_name) {
struct swap_header_v1_2 *h;
/* Sanity check */
@ -520,7 +500,7 @@ main(int argc, char ** argv) {
char *block_count = 0;
char *pp;
char *opt_label = NULL;
char *uuid = NULL;
unsigned char *uuid = NULL;
#ifdef HAVE_LIBUUID
uuid_t uuid_dat;
#endif