Skip to content

Commit 92fa6f1

Browse files
committed
[64/32] whoops
1 parent ebdb4ff commit 92fa6f1

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

revorb.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,34 @@
4141

4242
#include "revorb.h"
4343

44-
int revorb_fread(void* buffer, size_t size, size_t n, REVORB_FILE* fp) {
44+
size_t revorb_fread(void* buffer, size_t size, size_t n, REVORB_FILE* fp) {
4545
if (fp->size == -1) {
4646
return -1;
4747
}
4848
size_t sz = size * n;
49-
int offset = (int)(fp->cursor) - (int)(fp->start);
49+
intptr_t offset = (intptr_t)(fp->cursor) - (intptr_t)(fp->start);
5050
if (offset + sz > fp->size) {
5151
sz = fp->size - offset;
5252
}
5353
memcpy(buffer, fp->cursor, sz);
54-
(int)fp->cursor += sz;
54+
(intptr_t)fp->cursor += sz;
5555
return sz;
5656
}
5757

58-
int revorb_fwrite(void* buffer, size_t size, size_t n, REVORB_FILE* fp) {
58+
size_t revorb_fwrite(void* buffer, size_t size, size_t n, REVORB_FILE* fp) {
5959
if (fp->size == -1) {
6060
return -1;
6161
}
6262
size_t sz = size * n;
63-
int offset = (intptr_t)(fp->cursor) - (intptr_t)(fp->start);
63+
intptr_t offset = (intptr_t)(fp->cursor) - (intptr_t)(fp->start);
6464
if (fp->size - offset < sz) {
65-
int delta = sz - (fp->size - offset);
65+
intptr_t delta = sz - (fp->size - offset);
6666
fp->size += delta + 1;
6767
fp->start = (void*)realloc(fp->start, fp->size);
68-
fp->cursor = (void*)((int)fp->start + offset);
68+
fp->cursor = (void*)((intptr_t)fp->start + offset);
6969
}
7070
memcpy(fp->cursor, buffer, sz);
71-
(int)fp->cursor += sz;
71+
(intptr_t)fp->cursor += sz;
7272
return sz;
7373
}
7474
void revorb_fclose(REVORB_FILE* fp) {
@@ -86,7 +86,7 @@ REVORB_RESULT copy_headers(REVORB_FILE* fi,
8686
ogg_stream_state* os,
8787
vorbis_info* vi) {
8888
char* buffer = ogg_sync_buffer(si, 4096);
89-
int numread = revorb_fread(buffer, 1, 4096, fi);
89+
size_t numread = revorb_fread(buffer, 1, 4096, fi);
9090
ogg_sync_wrote(si, numread);
9191

9292
ogg_page page;
@@ -259,7 +259,7 @@ REVORBAPI REVORB_RESULT revorb(REVORB_FILE* fi, REVORB_FILE* fo) {
259259
if (eos == 2)
260260
break;
261261

262-
{
262+
{
263263
packet.e_o_s = 1;
264264
ogg_stream_packetin(&stream_out, &packet);
265265
ogg_page opage;

0 commit comments

Comments
 (0)