From e8765e06ec8536b9e28e2ab142858e60023fbf1e Mon Sep 17 00:00:00 2001 From: dartvader316 Date: Wed, 14 Aug 2024 19:06:55 +0300 Subject: [PATCH] fix conflicting name: addr --- desync.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/desync.c b/desync.c index 4df8a81..3f63265 100644 --- a/desync.c +++ b/desync.c @@ -197,26 +197,25 @@ ssize_t send_fake(int sfd, char *buffer, break; } #else - // Emulate sendfile on other unix systems // https://mail-index.netbsd.org/tech-kern/2008/11/25/msg003672.html + #warning "no sendfile" #ifdef __linux__ #define MAP_FILE 0 #endif - void *addr = mmap(NULL, pos, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, ffd, 0); - if (addr == MAP_FAILED) { + void *p2 = mmap(NULL, pos, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, ffd, 0); + if (p2 == MAP_FAILED) { uniperror("mmap ffd"); break; } - len = send(sfd, addr, pos, 0); + len = send(sfd, p2, pos, 0); if (len < 0) { uniperror("send sfd"); break; } - if (munmap(addr, pos) == -1) { + if (munmap(p2, pos) == -1) { uniperror("munmap"); break; } - #endif wait_send(sfd); memcpy(p, buffer, pos);