Module Name: src
Committed By: roy
Date: Thu Nov 3 10:12:58 UTC 2011
Modified Files:
src/usr.bin/tic: tic.c
Log Message:
Use memmove as we are effectively moving memory from left to right so
that the use=foo capability is removed when merging foo.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/tic/tic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tic/tic.c
diff -u src/usr.bin/tic/tic.c:1.10 src/usr.bin/tic/tic.c:1.11
--- src/usr.bin/tic/tic.c:1.10 Mon Feb 22 23:05:39 2010
+++ src/usr.bin/tic/tic.c Thu Nov 3 10:12:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tic.c,v 1.10 2010/02/22 23:05:39 roy Exp $ */
+/* $NetBSD: tic.c,v 1.11 2011/11/03 10:12:57 roy Exp $ */
/*
* Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: tic.c,v 1.10 2010/02/22 23:05:39 roy Exp $");
+__RCSID("$NetBSD: tic.c,v 1.11 2011/11/03 10:12:57 roy Exp $");
#include <sys/types.h>
@@ -357,7 +357,7 @@ merge_use(int flags)
cap += sizeof(uint16_t) + num;
memn = rtic->extras.bufpos -
(cap - rtic->extras.buf);
- memcpy(scap, cap, memn);
+ memmove(scap, cap, memn);
rtic->extras.bufpos -= cap - scap;
cap = scap;
rtic->extras.entries--;
