summaryrefslogtreecommitdiff
path: root/usr/src/lib/efcode
diff options
context:
space:
mode:
authormathue <none@none>2005-10-31 16:23:43 -0800
committermathue <none@none>2005-10-31 16:23:43 -0800
commit360e6f5e7a29d5950aa1985f56811731715da7e5 (patch)
treecc4e7b99a37f36661f7fdfdd5bd6c17ce5aa43a4 /usr/src/lib/efcode
parent00f52bfc16236f42c91b1dd6912115e2609bfe1a (diff)
downloadillumos-joyent-360e6f5e7a29d5950aa1985f56811731715da7e5.tar.gz
6309366 gcc and cmd/cvcd don't get along
6272090 gcc and cmd/pcmciad don't get along 6273814 gcc and cmd/rmformat don't get along 6273880 gcc and cmd/smserverd don't get along 6309225 gcc and efcode don't get along 6309403 gcc and se don't get along 6310538 gcc and stp4020 don't get along 6309970 gcc and fas don't get along 6310423 gcc and zs don't get along 6309951 gcc and ebus don't get along 6310427 gcc and su driver don't get along 6310552 gcc and starfire don't get along 6308013 gcc and cmd/picl don't get along 6310441 gcc and rmclomv don't get along 6309943 gcc and sun ata don't get along 6309421 gcc and excalibur/io don't get along
Diffstat (limited to 'usr/src/lib/efcode')
-rw-r--r--usr/src/lib/efcode/engine/debug.c6
-rw-r--r--usr/src/lib/efcode/engine/env.c2
-rw-r--r--usr/src/lib/efcode/engine/mcookie.c6
3 files changed, 9 insertions, 5 deletions
diff --git a/usr/src/lib/efcode/engine/debug.c b/usr/src/lib/efcode/engine/debug.c
index bcdd238b94..bbc32ebdf5 100644
--- a/usr/src/lib/efcode/engine/debug.c
+++ b/usr/src/lib/efcode/engine/debug.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2000-2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -812,7 +812,7 @@ dump_line(uchar_t *ptr)
uchar_t *byte;
int i;
- log_message(MSG_INFO, "%p ", (uint32_t)ptr);
+ log_message(MSG_INFO, "%p ", ptr);
for (i = 0, byte = ptr; i < 16; i++) {
if (i == 8)
log_message(MSG_INFO, " ");
@@ -1048,7 +1048,7 @@ dump(fcode_env_t *env)
offset = ((long)data) & 0xf;
len += offset;
data = (uchar_t *)((long)data & ~0xf);
- sprintf(buf, "%p", (uint32_t)data);
+ sprintf(buf, "%p", data);
print_bytes_header(strlen(buf), offset);
for (len += offset; len > 0; len -= 16, data += 16)
dump_line(data);
diff --git a/usr/src/lib/efcode/engine/env.c b/usr/src/lib/efcode/engine/env.c
index e5d20ec882..0fe815baed 100644
--- a/usr/src/lib/efcode/engine/env.c
+++ b/usr/src/lib/efcode/engine/env.c
@@ -67,7 +67,7 @@ do_emit(fcode_env_t *env, uchar_t c)
if ((c >= 0x20 && c <= 0x7f) || c == '\n' || c == '\r' ||
c == '\b')
putchar(c);
- else if (c >= 0 && c < 0x20)
+ else if (c < 0x20)
printf("@%c", c + '@');
else
printf("\\%x", c);
diff --git a/usr/src/lib/efcode/engine/mcookie.c b/usr/src/lib/efcode/engine/mcookie.c
index 8a12bf547a..3921dc2e8c 100644
--- a/usr/src/lib/efcode/engine/mcookie.c
+++ b/usr/src/lib/efcode/engine/mcookie.c
@@ -20,7 +20,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2000-2003 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -155,6 +155,8 @@ mcookie_to_rlen(fstack_t mcookie)
}
log_message(MSG_WARN, "Warning: mcookie_to_rlen: invalid"
" mcookie: %llx\n", (uint64_t)mcookie);
+
+ return (0);
}
fstack_t
@@ -172,6 +174,8 @@ mcookie_to_rvirt(fstack_t mcookie)
}
log_message(MSG_WARN, "Warning: mcookie_to_rvirt: invalid"
" mcookie: %llx\n", (uint64_t)mcookie);
+
+ return (0);
}
static void