From e598bb46390fec51583fa8b7998b625106e6b7d5 Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Wed, 17 Sep 2008 11:02:57 +0000 Subject: [PATCH] Add a type identifier to argument sz to sqlite3PageMalloc() in pcache.c. Ticket #3383. (CVS 5713) FossilOrigin-Name: 94fde77b9a4efde5f7fb2a84fedaf38b0ebbac70 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/pcache.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index b53f3717cf..46bcc13dfc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sfor\stickets\s#3378\sand\s#3381\sthat\spreserves\sthe\saliasing\soptimization.\nAnd\syet,\sthis\sfix\sfeels\suncomfortable.\s\sSeeking\san\salternative...\s(CVS\s5712) -D 2008-09-17T00:13:12 +C Add\sa\stype\sidentifier\sto\sargument\ssz\sto\ssqlite3PageMalloc()\sin\spcache.c.\sTicket\s#3383.\s(CVS\s5713) +D 2008-09-17T11:02:57 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in d15a7ebfe5e057a72a49805ffb302dbb601c8329 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -140,7 +140,7 @@ F src/os_win.c 3209dc0ed734291764393ea8d534ba0d8696a540 F src/pager.c f21654d1fcfd62ce058dbb88d07159745dc5bd84 F src/pager.h c45380ca9d0933ea5bc4ecb3a43958b6d2ec5a9c F src/parse.y d0f76d2cb8d6883d5600dc20beb961a6022b94b8 -F src/pcache.c d3c0f4ad708929fba15886914b18b82d64e286bf +F src/pcache.c a39908e73cf5001dec2cc7a55a477fe8e8611db9 F src/pcache.h 53730c33310cdf7a5c94e8333c853d59a3b30226 F src/pragma.c e633b6b7dabc110e2abfed4e35ba34a4039cb65c F src/prepare.c c7e00ed1b0bdcf699b1aad651247d4dc3d281b0b @@ -637,7 +637,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P a67da9dd2ff6acc163de4ce2b836b03e3f159a88 -R 14978e8fa671319bba1736bf8a70ed4f -U drh -Z 020ff8f35c07f9455927e2b1f65bc01f +P f8b759f1977915c314be874840ebf18e6bc69b57 +R 8c3fe913436cdf48666844c295a610a7 +U danielk1977 +Z 30cb1003b5d39513a1e8a125fdb27449 diff --git a/manifest.uuid b/manifest.uuid index 31500ab308..35f9df5fe4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f8b759f1977915c314be874840ebf18e6bc69b57 \ No newline at end of file +94fde77b9a4efde5f7fb2a84fedaf38b0ebbac70 \ No newline at end of file diff --git a/src/pcache.c b/src/pcache.c index 2b90bd7e35..c7c7fac78f 100644 --- a/src/pcache.c +++ b/src/pcache.c @@ -11,7 +11,7 @@ ************************************************************************* ** This file implements that page cache. ** -** @(#) $Id: pcache.c,v 1.27 2008/09/15 15:36:58 drh Exp $ +** @(#) $Id: pcache.c,v 1.28 2008/09/17 11:02:57 danielk1977 Exp $ */ #include "sqliteInt.h" @@ -434,7 +434,7 @@ void *pcacheMalloc(int sz, PCache *pCache){ return p; } } -void *sqlite3PageMalloc(sz){ +void *sqlite3PageMalloc(int sz){ void *p; pcacheEnterMutex(); p = pcacheMalloc(sz, 0);