remove redefines for PAGER_MJ_PGNO to PAGER_SJ_PGNO

sjlombardo · sjlombardo · commit 4fec0dc8ad0f · 2022-07-25T13:00:03.000-04:00
diff --git a/src/crypto.c b/src/crypto.c
@@ -978,7 +978,7 @@ int sqlite3_rekey_v2(sqlite3 *db, const char *zDb, const void *pKey, int nKey) {
       rc = sqlite3BtreeBeginTrans(pDb->pBt, 1, 0); /* begin write transaction */
       sqlite3PagerPagecount(pPager, &page_count);
       for(pgno = 1; rc == SQLITE_OK && pgno <= (unsigned int)page_count; pgno++) { /* pgno's start at 1 see pager.c:pagerAcquire */
-        if(!sqlite3pager_is_mj_pgno(pPager, pgno)) { /* skip this page (see pager.c:pagerAcquire for reasoning) */
+        if(!sqlite3pager_is_sj_pgno(pPager, pgno)) { /* skip this page (see pager.c:pagerAcquire for reasoning) */
           rc = sqlite3PagerGet(pPager, pgno, &page, 0);
           if(rc == SQLITE_OK) { /* write page see pager_incr_changecounter for example */
             rc = sqlite3PagerWrite(page);
diff --git a/src/crypto.h b/src/crypto.h
@@ -66,7 +66,7 @@
 /* extensions defined in pager.c */ 
 void *sqlcipherPagerGetCodec(Pager*);
 void sqlcipherPagerSetCodec(Pager*, void *(*)(void*,void*,Pgno,int),  void (*)(void*,int,int),  void (*)(void*), void *);
-int sqlite3pager_is_mj_pgno(Pager*, Pgno);
+int sqlite3pager_is_sj_pgno(Pager*, Pgno);
 void sqlite3pager_error(Pager*, int);
 void sqlite3pager_reset(Pager *pPager);
 /* end extensions defined in pager.c */
diff --git a/src/crypto_impl.c b/src/crypto_impl.c
@@ -34,10 +34,6 @@
 #include "sqlcipher.h"
 #include "crypto.h"
 
-#ifndef PAGER_MJ_PGNO
-#define PAGER_MJ_PGNO(x) PAGER_SJ_PGNO(x)
-#endif
-
 #ifdef SQLCIPHER_TEST
 static volatile unsigned int cipher_test_flags = 0;
 unsigned int sqlcipher_get_test_flags() {
@@ -1382,8 +1378,8 @@ int sqlcipher_codec_ctx_integrity_check(codec_ctx *ctx, Parse *pParse, char *col
     int payload_sz = ctx->page_sz - ctx->reserve_sz + ctx->iv_sz;
     int read_sz = ctx->page_sz;
 
-    /* skip integrity check on PAGER_MJ_PGNO since it will have no valid content */
-    if(sqlite3pager_is_mj_pgno(ctx->pBt->pBt->pPager, page)) continue;
+    /* skip integrity check on PAGER_SJ_PGNO since it will have no valid content */
+    if(sqlite3pager_is_sj_pgno(ctx->pBt->pBt->pPager, page)) continue;
 
     if(page==1) {
       int page1_offset = ctx->plaintext_header_sz ? ctx->plaintext_header_sz : FILE_HEADER_SZ;
diff --git a/src/pager.c b/src/pager.c
@@ -7906,12 +7906,8 @@ int sqlite3PagerWalFramesize(Pager *pPager){
 /* BEGIN SQLCIPHER */
 #ifdef SQLITE_HAS_CODEC
 
-#ifndef PAGER_MJ_PGNO
-#define PAGER_MJ_PGNO(x) PAGER_SJ_PGNO(x)
-#endif
-
-int sqlite3pager_is_mj_pgno(Pager *pPager, Pgno pgno) {
-  return (PAGER_MJ_PGNO(pPager) == pgno) ? 1 : 0;
+int sqlite3pager_is_sj_pgno(Pager *pPager, Pgno pgno) {
+  return (PAGER_SJ_PGNO(pPager) == pgno) ? 1 : 0;
 }
 
 void sqlite3pager_error(Pager *pPager, int error) {
