Module Name: src
Committed By: martin
Date: Thu Apr 3 17:02:34 UTC 2014
Modified Files:
src/sys/arch/ia64/disasm: disasm.h disasm_format.c
Log Message:
Fix snprintf fallout
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/disasm/disasm.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/disasm/disasm_format.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/disasm/disasm.h
diff -u src/sys/arch/ia64/disasm/disasm.h:1.1 src/sys/arch/ia64/disasm/disasm.h:1.2
--- src/sys/arch/ia64/disasm/disasm.h:1.1 Fri Apr 7 14:21:18 2006
+++ src/sys/arch/ia64/disasm/disasm.h Thu Apr 3 17:02:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disasm.h,v 1.1 2006/04/07 14:21:18 cherry Exp $ */
+/* $NetBSD: disasm.h,v 1.2 2014/04/03 17:02:34 martin Exp $ */
/*-
* Copyright (c) 2000-2003 Marcel Moolenaar
@@ -316,9 +316,9 @@ int asm_extract(enum asm_op, enum asm_fm
int asm_decode(uint64_t, struct asm_bundle *);
-void asm_completer(const struct asm_cmpltr *, char *);
-void asm_mnemonic(const enum asm_op, char *);
-void asm_operand(const struct asm_oper *, char *, uint64_t);
+void asm_completer(const struct asm_cmpltr *, char *, size_t);
+void asm_mnemonic(const enum asm_op, char *, size_t);
+void asm_operand(const struct asm_oper *, char *, size_t, uint64_t);
void asm_print_bundle(const struct asm_bundle *, uint64_t);
void asm_print_inst(const struct asm_bundle *, int, uint64_t);
Index: src/sys/arch/ia64/disasm/disasm_format.c
diff -u src/sys/arch/ia64/disasm/disasm_format.c:1.3 src/sys/arch/ia64/disasm/disasm_format.c:1.4
--- src/sys/arch/ia64/disasm/disasm_format.c:1.3 Thu Mar 27 18:22:56 2014
+++ src/sys/arch/ia64/disasm/disasm_format.c Thu Apr 3 17:02:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: disasm_format.c,v 1.3 2014/03/27 18:22:56 christos Exp $ */
+/* $NetBSD: disasm_format.c,v 1.4 2014/04/03 17:02:34 martin Exp $ */
/*-
* Copyright (c) 2000-2003 Marcel Moolenaar
@@ -287,7 +287,7 @@ asm_operand(const struct asm_oper *o, ch
case 12: l = strlcpy(buf, "sp", buflen); break;
case 13: l = strlcpy(buf, "tp", buflen); break;
default:
- l += snprintf(buf, buflen, "r%d", (int)o->o_value);
+ l = snprintf(buf, buflen, "r%d", (int)o->o_value);
if (l > buflen)
l = buflen;
break;
