[Tarantool-patches] [PATCH 02/14] box/journal: use plain int for return value

[Cyrill Gorcunov]

We're returning int64_t with values 0 or -1 by now,
there is no need for such big return type, plain
integer is enough.

Signed-off-by: Cyrill Gorcunov <gorcunov at gmail.com>
---
 src/box/box.cc    | 2 +-
 src/box/journal.c | 2 +-
 src/box/journal.h | 8 ++++----
 src/box/wal.c     | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/box/box.cc b/src/box/box.cc
index 1b2b27d61..9e8311d1e 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -310,7 +310,7 @@ struct recovery_journal {
  * exact same signature during local recovery to properly mark
  * min/max LSN of created LSM levels.
  */
-static int64_t
+static int
 recovery_journal_write(struct journal *base,
 		       struct journal_entry *entry)
 {
diff --git a/src/box/journal.c b/src/box/journal.c
index d762613dd..cf6485642 100644
--- a/src/box/journal.c
+++ b/src/box/journal.c
@@ -36,7 +36,7 @@
  * Used to load from a memtx snapshot. LSN is not used,
  * but txn_commit() must work.
  */
-static int64_t
+static int
 dummy_journal_write(struct journal *journal, struct journal_entry *entry)
 {
 	(void) journal;
diff --git a/src/box/journal.h b/src/box/journal.h
index 236058bb1..55900d8e5 100644
--- a/src/box/journal.h
+++ b/src/box/journal.h
@@ -112,8 +112,8 @@ journal_entry_complete(struct journal_entry *entry)
  * synchronous replication.
  */
 struct journal {
-	int64_t (*write)(struct journal *journal,
-			 struct journal_entry *req);
+	int (*write)(struct journal *journal,
+		     struct journal_entry *req);
 	void (*destroy)(struct journal *journal);
 };
 
@@ -128,7 +128,7 @@ extern struct journal *current_journal;
  *
  * @return 0 if write was scheduled or -1 in case of an error.
  */
-static inline int64_t
+static inline int
 journal_write(struct journal_entry *entry)
 {
 	return current_journal->write(current_journal, entry);
@@ -165,7 +165,7 @@ journal_set(struct journal *new_journal)
 
 static inline void
 journal_create(struct journal *journal,
-	       int64_t (*write)(struct journal *, struct journal_entry *),
+	       int (*write)(struct journal *, struct journal_entry *),
 	       void (*destroy)(struct journal *))
 {
 	journal->write = write;
diff --git a/src/box/wal.c b/src/box/wal.c
index 0ae66ff32..ac977c16e 100644
--- a/src/box/wal.c
+++ b/src/box/wal.c
@@ -60,10 +60,10 @@ const char *wal_mode_STRS[] = { "none", "write", "fsync", NULL };
 
 int wal_dir_lock = -1;
 
-static int64_t
+static int
 wal_write(struct journal *, struct journal_entry *);
 
-static int64_t
+static int
 wal_write_in_wal_mode_none(struct journal *, struct journal_entry *);
 
 /*
@@ -1157,7 +1157,7 @@ wal_writer_f(va_list ap)
  * WAL writer main entry point: queue a single request
  * to be written to disk.
  */
-static int64_t
+static int
 wal_write(struct journal *journal, struct journal_entry *entry)
 {
 	struct wal_writer *writer = (struct wal_writer *) journal;
@@ -1213,7 +1213,7 @@ wal_write(struct journal *journal, struct journal_entry *entry)
 	return -1;
 }
 
-static int64_t
+static int
 wal_write_in_wal_mode_none(struct journal *journal,
 			   struct journal_entry *entry)
 {
-- 
2.20.1