diff options
| author | Geoff Levand <geoffrey.levand@am.sony.com> | 2009-04-12 15:11:37 +0000 |
|---|---|---|
| committer | Jeremy Kerr <jk@ozlabs.org> | 2009-06-30 15:28:55 +0800 |
| commit | e058e90117300125af7b6e93eb0e5aeb23543af9 (patch) | |
| tree | bce5275dfd1ac92a7b3da8875ba876f1d6dadcff | |
| parent | ea45e832b0d3e4a6e8c63f6a1c4741795b0b33dd (diff) | |
| download | talos-petitboot-e058e90117300125af7b6e93eb0e5aeb23543af9.tar.gz talos-petitboot-e058e90117300125af7b6e93eb0e5aeb23543af9.zip | |
Fix memmove size
Correct the byte count for several memmove calls.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
| -rw-r--r-- | lib/waiter/waiter.c | 3 | ||||
| -rw-r--r-- | ui/common/discover-client.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/waiter/waiter.c b/lib/waiter/waiter.c index 214dfda..68f483a 100644 --- a/lib/waiter/waiter.c +++ b/lib/waiter/waiter.c @@ -43,7 +43,8 @@ void waiter_remove(struct waiter *waiter) assert(i >= 0 && i < n_waiters); n_waiters--; - memmove(&waiters[i], &waiters[i+1], n_waiters - i); + memmove(&waiters[i], &waiters[i+1], + (n_waiters - i) * sizeof(waiters[0])); waiters = talloc_realloc(NULL, waiters, struct waiter, n_waiters); } diff --git a/ui/common/discover-client.c b/ui/common/discover-client.c index b1ef440..e8ce4dd 100644 --- a/ui/common/discover-client.c +++ b/ui/common/discover-client.c @@ -111,7 +111,7 @@ static void device_remove(struct discover_client *client, const char *id) /* remove the device from the client's device array */ client->n_devices--; memmove(&client->devices[i], &client->devices[i+1], - client->n_devices - i); + (client->n_devices - i) * sizeof(client->devices[0])); client->devices = talloc_realloc(client, client->devices, struct device *, client->n_devices); |
