summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2014-03-29 15:23:42 -0400
committerRJ Ryan <rryan@mixxx.org>2014-03-29 15:23:42 -0400
commitcc03e0ee05f4e97b0bbc0ea0f3b35be4c05729e8 (patch)
tree83bc5db7bd9178a41f3df32fa7753aa7e5fa8287 /lib
parent98105c8c5030d549d2747b555ea17d1f9ccaaeac (diff)
I am failing hard today.
Diffstat (limited to 'lib')
-rw-r--r--lib/xwax/lut.c (renamed from lib/xwax/lut_win32.c)6
-rw-r--r--lib/xwax/lut_win32.cpp6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/xwax/lut_win32.c b/lib/xwax/lut.c
index 1ad06c2064..6f02680e5c 100644
--- a/lib/xwax/lut_win32.c
+++ b/lib/xwax/lut.c
@@ -43,16 +43,16 @@ int lut_init(struct lut *lut, int nslots)
bytes = sizeof(struct slot) * nslots + sizeof(slot_no_t) * hashes;
fprintf(stderr, "Lookup table has %d hashes to %d slots"
- " (%d slots per hash, %u Kb)\n",
+ " (%d slots per hash, %zuKb)\n",
hashes, nslots, nslots / hashes, bytes / 1024);
- lut->slot = (struct slot*)(malloc(sizeof(struct slot) * nslots));
+ lut->slot = malloc(sizeof(struct slot) * nslots);
if (lut->slot == NULL) {
perror("malloc");
return -1;
}
- lut->table = (slot_no_t*)(malloc(sizeof(slot_no_t) * hashes));
+ lut->table = malloc(sizeof(slot_no_t) * hashes);
if (lut->table == NULL) {
perror("malloc");
return -1;
diff --git a/lib/xwax/lut_win32.cpp b/lib/xwax/lut_win32.cpp
index 3f55251b6f..732a782492 100644
--- a/lib/xwax/lut_win32.cpp
+++ b/lib/xwax/lut_win32.cpp
@@ -45,16 +45,16 @@ int lut_init(struct lut *lut, int nslots)
bytes = sizeof(struct slot) * nslots + sizeof(slot_no_t) * hashes;
fprintf(stderr, "Lookup table has %d hashes to %d slots"
- " (%d slots per hash, %zuKb)\n",
+ " (%d slots per hash, %u Kb)\n",
hashes, nslots, nslots / hashes, bytes / 1024);
- lut->slot = malloc(sizeof(struct slot) * nslots);
+ lut->slot = (struct slot*)(malloc(sizeof(struct slot) * nslots));
if (lut->slot == NULL) {
perror("malloc");
return -1;
}
- lut->table = malloc(sizeof(slot_no_t) * hashes);
+ lut->table = (slot_no_t*)(malloc(sizeof(slot_no_t) * hashes));
if (lut->table == NULL) {
perror("malloc");
return -1;