From: stephan Date: Mon, 1 Sep 2025 00:32:43 +0000 (+0000) Subject: Fix a line-wrap change made in [50234bc9e9fe58da] which broke the docsrc build by... X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f91151bfa1ae8d8115653c9dd5145220ce8eb1a1;p=thirdparty%2Fsqlite.git Fix a line-wrap change made in [50234bc9e9fe58da] which broke the docsrc build by splitting a link reference across two lines, which the doc processor does not like. Problem reported in [forum:ea1fe5f421549899 | forum post ea1fe5f4215]. FossilOrigin-Name: 321938063e2d6c579b992bbbed5210c8a051a8b2fe858bb88f95dbd8fb0f35dc --- diff --git a/manifest b/manifest index b5981ef101..75ee138a0b 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Update\stest\sscript\sreservebytes.test\sso\sthat\sit\sworks\swith\sthe\s"prepare"\spermutation. -D 2025-08-29T16:51:16.029 +C Fix\sa\sline-wrap\schange\smade\sin\s[50234bc9e9fe58da]\swhich\sbroke\sthe\sdocsrc\sbuild\sby\ssplitting\sa\slink\sreference\sacross\stwo\slines,\swhich\sthe\sdoc\sprocessor\sdoes\snot\slike.\sProblem\sreported\sin\s[forum:ea1fe5f421549899\s|\sforum\spost\sea1fe5f4215]. +D 2025-09-01T00:32:43.056 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -743,7 +743,7 @@ F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957 F src/shell.c.in 51c8452b3e6b9a0dfa3df853dd16f147e5e4ae2002deb775cf8a2fccf01c3c6c -F src/sqlite.h.in d70f7a24ce74e28138b2eb26cfa4de6739f7ddd626678a9fdcf9f2c3d9c73184 +F src/sqlite.h.in 7ceea612f0b54f53676e082890a175c6ff247191671d90d20843fde3d6f7b663 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 0bfd049bb2088cc44c2ad54f2079d1c6e43091a4e1ce8868779b75f6c1484f1e F src/sqliteInt.h 27c73e48878d31ef230ba867d1f8c3af6aed357fd93ccc605d3f1aae007ea62b @@ -2171,8 +2171,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P f04a826bac1620b28c32252fa2ceaccc5dfbb21405a6a98942f95d3d1ca89acb -R 87e6488b6c353ca89af36ac87a0c9304 -U dan -Z 666f3b9990a6df9c120045dccad47a75 +P 4ac774364b693a4b992c997c64bf425e2765133a7a25963cbf2b02c180eeaba5 +R beb89ff30bf66d0f2716e8e2c62ea507 +U stephan +Z 9d54bf9cfd5b8af6bd11b0c714f7bf36 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6a5520a1ec..d9e1c0b0f3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4ac774364b693a4b992c997c64bf425e2765133a7a25963cbf2b02c180eeaba5 +321938063e2d6c579b992bbbed5210c8a051a8b2fe858bb88f95dbd8fb0f35dc diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 11fd1d9a9b..4dace4a813 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -10989,15 +10989,15 @@ unsigned char *sqlite3_serialize( /* ** CAPI3REF: Deserialize a database ** -** The sqlite3_deserialize(D,S,P,N,M,F) interface causes the [database -** connection] D to disconnect from database S and then reopen S as an -** in-memory database based on the serialization contained in P. If S -** is a NULL pointer, the main database is used. The serialized -** database P is N bytes in size. M is the size of the buffer P, -** which might be larger than N. If M is larger than N, and the -** SQLITE_DESERIALIZE_READONLY bit is not set in F, then SQLite is -** permitted to add content to the in-memory database as long as the -** total size does not exceed M bytes. +** The sqlite3_deserialize(D,S,P,N,M,F) interface causes the +** [database connection] D to disconnect from database S and then +** reopen S as an in-memory database based on the serialization +** contained in P. If S is a NULL pointer, the main database is +** used. The serialized database P is N bytes in size. M is the size +** of the buffer P, which might be larger than N. If M is larger than +** N, and the SQLITE_DESERIALIZE_READONLY bit is not set in F, then +** SQLite is permitted to add content to the in-memory database as +** long as the total size does not exceed M bytes. ** ** If the SQLITE_DESERIALIZE_FREEONCLOSE bit is set in F, then SQLite will ** invoke sqlite3_free() on the serialization buffer when the database