From e2c08028054d25c2ff9e946d35d0f82af7f459e0 Mon Sep 17 00:00:00 2001
From: Kirill Yukhin <kyukhin@tarantool.org>
Date: Thu, 18 Jan 2018 15:13:45 +0300
Subject: [PATCH] sql: Fix build for FreeBSD
There're 3 places where FreeBSD specific routines
contained (for compatibility) unused parameters.
Mark them w/ unused attribute.
Closes #3037
---
src/box/sql/os.c | 8 ++++++--
src/box/sql/os_unix.c | 6 +++++-
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/box/sql/os.c b/src/box/sql/os.c
index 291434bd08..845b887a1f 100644
--- a/src/box/sql/os.c
+++ b/src/box/sql/os.c
@@ -257,14 +257,18 @@ sqlite3OsUnfetch(sqlite3_file * id, i64 iOff, void *p)
#else
/* No-op stubs to use when memory-mapped I/O is disabled */
int
-sqlite3OsFetch(sqlite3_file * id, i64 iOff, int iAmt, void **pp)
+sqlite3OsFetch(sqlite3_file * id __attribute__((__unused__)),
+ i64 iOff __attribute__((__unused__)),
+ int iAmt __attribute__((__unused__)), void **pp)
{
*pp = 0;
return SQLITE_OK;
}
int
-sqlite3OsUnfetch(sqlite3_file * id, i64 iOff, void *p)
+sqlite3OsUnfetch(sqlite3_file * id __attribute__((__unused__)),
+ i64 iOff __attribute__((__unused__)),
+ void *p __attribute__((__unused__)))
{
return SQLITE_OK;
}
diff --git a/src/box/sql/os_unix.c b/src/box/sql/os_unix.c
index 7d4985464a..b28d613439 100644
--- a/src/box/sql/os_unix.c
+++ b/src/box/sql/os_unix.c
@@ -326,7 +326,9 @@ posixOpen(const char *zFile, int flags, int mode)
/* Forward reference */
static int openDirectory(const char *, int *);
+#if SQLITE_MAX_MMAP_SIZE > 0
static int unixGetpagesize(void);
+#endif
/*
* Many system calls are accessed through pointer-to-functions so that
@@ -3753,7 +3755,9 @@ unixMapfile(unixFile * pFd, i64 nMap)
* release the reference by calling unixUnfetch().
*/
static int
-unixFetch(sqlite3_file * fd, i64 iOff, int nAmt, void **pp)
+unixFetch(sqlite3_file * fd __attribute__((__unused__)),
+ i64 iOff __attribute__((__unused__)),
+ int nAmt __attribute__((__unused__)), void **pp)
{
#if SQLITE_MAX_MMAP_SIZE>0
unixFile *pFd = (unixFile *) fd; /* The underlying database file */
--
GitLab