Fossil SCM
Remove some end-of-line whitespace. No functional changes.
Commit
8307133b7cc14b30bbc2e8df9ab38e4ae1efd88aa89183ea269d95e61fd828a4
Parent
c1933caf03a036b…
1 file changed
+8
-8
+8
-8
| --- src/search.c | ||
| +++ src/search.c | ||
| @@ -2198,12 +2198,12 @@ | ||
| 2198 | 2198 | Fts5PhraseIter iter; |
| 2199 | 2199 | int iCol, iOff; |
| 2200 | 2200 | u32 *aOut = (u32*)pUserData; |
| 2201 | 2201 | int iPrev = -1; |
| 2202 | 2202 | |
| 2203 | - for(pApi->xPhraseFirst(pFts, 0, &iter, &iCol, &iOff); | |
| 2204 | - iCol>=0; | |
| 2203 | + for(pApi->xPhraseFirst(pFts, 0, &iter, &iCol, &iOff); | |
| 2204 | + iCol>=0; | |
| 2205 | 2205 | pApi->xPhraseNext(pFts, &iter, &iCol, &iOff) |
| 2206 | 2206 | ){ |
| 2207 | 2207 | aOut[iCol*3+1]++; |
| 2208 | 2208 | if( iCol!=iPrev ) aOut[iCol*3 + 2]++; |
| 2209 | 2209 | iPrev = iCol; |
| @@ -2220,15 +2220,15 @@ | ||
| 2220 | 2220 | u32 *aOut |
| 2221 | 2221 | ){ |
| 2222 | 2222 | int rc = SQLITE_OK; |
| 2223 | 2223 | switch( f ){ |
| 2224 | 2224 | case 'p': |
| 2225 | - aOut[0] = p->nPhrase; | |
| 2225 | + aOut[0] = p->nPhrase; | |
| 2226 | 2226 | break; |
| 2227 | 2227 | |
| 2228 | 2228 | case 'c': |
| 2229 | - aOut[0] = p->nCol; | |
| 2229 | + aOut[0] = p->nCol; | |
| 2230 | 2230 | break; |
| 2231 | 2231 | |
| 2232 | 2232 | case 'x': { |
| 2233 | 2233 | int i; |
| 2234 | 2234 | for(i=0; i<p->nPhrase && rc==SQLITE_OK; i++){ |
| @@ -2285,11 +2285,11 @@ | ||
| 2285 | 2285 | |
| 2286 | 2286 | for(iPhrase=0; iPhrase<p->nPhrase; iPhrase++){ |
| 2287 | 2287 | Fts5PhraseIter iter; |
| 2288 | 2288 | int iCol; |
| 2289 | 2289 | for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol); |
| 2290 | - iCol>=0; | |
| 2290 | + iCol>=0; | |
| 2291 | 2291 | pApi->xPhraseNextColumn(pFts, &iter, &iCol) |
| 2292 | 2292 | ){ |
| 2293 | 2293 | aOut[iPhrase * ((p->nCol+31)/32) + iCol/32] |= ((u32)1 << iCol%32); |
| 2294 | 2294 | } |
| 2295 | 2295 | } |
| @@ -2305,12 +2305,12 @@ | ||
| 2305 | 2305 | for(i=0; i<(p->nCol*p->nPhrase); i++) aOut[i*nMul] = 0; |
| 2306 | 2306 | |
| 2307 | 2307 | for(iPhrase=0; iPhrase<p->nPhrase; iPhrase++){ |
| 2308 | 2308 | Fts5PhraseIter iter; |
| 2309 | 2309 | int iOff, iCol; |
| 2310 | - for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff); | |
| 2311 | - iOff>=0; | |
| 2310 | + for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff); | |
| 2311 | + iOff>=0; | |
| 2312 | 2312 | pApi->xPhraseNext(pFts, &iter, &iCol, &iOff) |
| 2313 | 2313 | ){ |
| 2314 | 2314 | aOut[nMul * (iCol + iPhrase * p->nCol)]++; |
| 2315 | 2315 | } |
| 2316 | 2316 | } |
| @@ -2360,11 +2360,11 @@ | ||
| 2360 | 2360 | break; |
| 2361 | 2361 | } |
| 2362 | 2362 | } |
| 2363 | 2363 | return rc; |
| 2364 | 2364 | } |
| 2365 | - | |
| 2365 | + | |
| 2366 | 2366 | static Fts5MatchinfoCtx *fts5MatchinfoNew( |
| 2367 | 2367 | const Fts5ExtensionApi *pApi, /* API offered by current FTS version */ |
| 2368 | 2368 | Fts5Context *pFts, /* First arg to pass to pApi functions */ |
| 2369 | 2369 | sqlite3_context *pCtx, /* Context for returning error message */ |
| 2370 | 2370 | const char *zArg /* Matchinfo flag string */ |
| 2371 | 2371 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -2198,12 +2198,12 @@ | |
| 2198 | Fts5PhraseIter iter; |
| 2199 | int iCol, iOff; |
| 2200 | u32 *aOut = (u32*)pUserData; |
| 2201 | int iPrev = -1; |
| 2202 | |
| 2203 | for(pApi->xPhraseFirst(pFts, 0, &iter, &iCol, &iOff); |
| 2204 | iCol>=0; |
| 2205 | pApi->xPhraseNext(pFts, &iter, &iCol, &iOff) |
| 2206 | ){ |
| 2207 | aOut[iCol*3+1]++; |
| 2208 | if( iCol!=iPrev ) aOut[iCol*3 + 2]++; |
| 2209 | iPrev = iCol; |
| @@ -2220,15 +2220,15 @@ | |
| 2220 | u32 *aOut |
| 2221 | ){ |
| 2222 | int rc = SQLITE_OK; |
| 2223 | switch( f ){ |
| 2224 | case 'p': |
| 2225 | aOut[0] = p->nPhrase; |
| 2226 | break; |
| 2227 | |
| 2228 | case 'c': |
| 2229 | aOut[0] = p->nCol; |
| 2230 | break; |
| 2231 | |
| 2232 | case 'x': { |
| 2233 | int i; |
| 2234 | for(i=0; i<p->nPhrase && rc==SQLITE_OK; i++){ |
| @@ -2285,11 +2285,11 @@ | |
| 2285 | |
| 2286 | for(iPhrase=0; iPhrase<p->nPhrase; iPhrase++){ |
| 2287 | Fts5PhraseIter iter; |
| 2288 | int iCol; |
| 2289 | for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol); |
| 2290 | iCol>=0; |
| 2291 | pApi->xPhraseNextColumn(pFts, &iter, &iCol) |
| 2292 | ){ |
| 2293 | aOut[iPhrase * ((p->nCol+31)/32) + iCol/32] |= ((u32)1 << iCol%32); |
| 2294 | } |
| 2295 | } |
| @@ -2305,12 +2305,12 @@ | |
| 2305 | for(i=0; i<(p->nCol*p->nPhrase); i++) aOut[i*nMul] = 0; |
| 2306 | |
| 2307 | for(iPhrase=0; iPhrase<p->nPhrase; iPhrase++){ |
| 2308 | Fts5PhraseIter iter; |
| 2309 | int iOff, iCol; |
| 2310 | for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff); |
| 2311 | iOff>=0; |
| 2312 | pApi->xPhraseNext(pFts, &iter, &iCol, &iOff) |
| 2313 | ){ |
| 2314 | aOut[nMul * (iCol + iPhrase * p->nCol)]++; |
| 2315 | } |
| 2316 | } |
| @@ -2360,11 +2360,11 @@ | |
| 2360 | break; |
| 2361 | } |
| 2362 | } |
| 2363 | return rc; |
| 2364 | } |
| 2365 | |
| 2366 | static Fts5MatchinfoCtx *fts5MatchinfoNew( |
| 2367 | const Fts5ExtensionApi *pApi, /* API offered by current FTS version */ |
| 2368 | Fts5Context *pFts, /* First arg to pass to pApi functions */ |
| 2369 | sqlite3_context *pCtx, /* Context for returning error message */ |
| 2370 | const char *zArg /* Matchinfo flag string */ |
| 2371 |
| --- src/search.c | |
| +++ src/search.c | |
| @@ -2198,12 +2198,12 @@ | |
| 2198 | Fts5PhraseIter iter; |
| 2199 | int iCol, iOff; |
| 2200 | u32 *aOut = (u32*)pUserData; |
| 2201 | int iPrev = -1; |
| 2202 | |
| 2203 | for(pApi->xPhraseFirst(pFts, 0, &iter, &iCol, &iOff); |
| 2204 | iCol>=0; |
| 2205 | pApi->xPhraseNext(pFts, &iter, &iCol, &iOff) |
| 2206 | ){ |
| 2207 | aOut[iCol*3+1]++; |
| 2208 | if( iCol!=iPrev ) aOut[iCol*3 + 2]++; |
| 2209 | iPrev = iCol; |
| @@ -2220,15 +2220,15 @@ | |
| 2220 | u32 *aOut |
| 2221 | ){ |
| 2222 | int rc = SQLITE_OK; |
| 2223 | switch( f ){ |
| 2224 | case 'p': |
| 2225 | aOut[0] = p->nPhrase; |
| 2226 | break; |
| 2227 | |
| 2228 | case 'c': |
| 2229 | aOut[0] = p->nCol; |
| 2230 | break; |
| 2231 | |
| 2232 | case 'x': { |
| 2233 | int i; |
| 2234 | for(i=0; i<p->nPhrase && rc==SQLITE_OK; i++){ |
| @@ -2285,11 +2285,11 @@ | |
| 2285 | |
| 2286 | for(iPhrase=0; iPhrase<p->nPhrase; iPhrase++){ |
| 2287 | Fts5PhraseIter iter; |
| 2288 | int iCol; |
| 2289 | for(pApi->xPhraseFirstColumn(pFts, iPhrase, &iter, &iCol); |
| 2290 | iCol>=0; |
| 2291 | pApi->xPhraseNextColumn(pFts, &iter, &iCol) |
| 2292 | ){ |
| 2293 | aOut[iPhrase * ((p->nCol+31)/32) + iCol/32] |= ((u32)1 << iCol%32); |
| 2294 | } |
| 2295 | } |
| @@ -2305,12 +2305,12 @@ | |
| 2305 | for(i=0; i<(p->nCol*p->nPhrase); i++) aOut[i*nMul] = 0; |
| 2306 | |
| 2307 | for(iPhrase=0; iPhrase<p->nPhrase; iPhrase++){ |
| 2308 | Fts5PhraseIter iter; |
| 2309 | int iOff, iCol; |
| 2310 | for(pApi->xPhraseFirst(pFts, iPhrase, &iter, &iCol, &iOff); |
| 2311 | iOff>=0; |
| 2312 | pApi->xPhraseNext(pFts, &iter, &iCol, &iOff) |
| 2313 | ){ |
| 2314 | aOut[nMul * (iCol + iPhrase * p->nCol)]++; |
| 2315 | } |
| 2316 | } |
| @@ -2360,11 +2360,11 @@ | |
| 2360 | break; |
| 2361 | } |
| 2362 | } |
| 2363 | return rc; |
| 2364 | } |
| 2365 | |
| 2366 | static Fts5MatchinfoCtx *fts5MatchinfoNew( |
| 2367 | const Fts5ExtensionApi *pApi, /* API offered by current FTS version */ |
| 2368 | Fts5Context *pFts, /* First arg to pass to pApi functions */ |
| 2369 | sqlite3_context *pCtx, /* Context for returning error message */ |
| 2370 | const char *zArg /* Matchinfo flag string */ |
| 2371 |