Fossil SCM

rename search_init() -> fossil_search_init() to avoid name collision w/ libedit (patch sumbmitted by Warren Young)

bch 2015-05-13 21:55 trunk
Commit 947369c12410afd7be9878c8f53b3950cfe1d6f3
Parent 42e77333ba8fcdd…
1 file changed +8 -7
~ src/search.c
M src/search.c
+8 -7
--- src/search.c
+++ src/search.c
@@ -100,13 +100,14 @@
100100
 if( p!=&gSearch ) fossil_free(p);
101101
 }
102102
 }
103103
104104
 /*
105
-** Compile a search pattern
105
+** Compile a search pattern. Can't call it search_init(), as that
106
+** conflicts with libedit.
106107
 */
107
-Search *search_init(
108
+Search *fossil_search_init(
108109
 const char *zPattern, /* The search pattern */
109110
 const char *zMarkBegin, /* Start of a match */
110111
 const char *zMarkEnd, /* End of a match */
111112
 const char *zMarkGap, /* A gap between two matches */
112113
 unsigned fSrchFlg /* Flags */
@@ -336,11 +337,11 @@
336337
 verify_all_options();
337338
 if( g.argc<4 ) usage("SEARCHSTRING FILE1...");
338339
 if( zBegin==0 ) zBegin = "[[";
339340
 if( zEnd==0 ) zEnd = "]]";
340341
 if( zGap==0 ) zGap = " ... ";
341
- p = search_init(g.argv[2], zBegin, zEnd, zGap, flg);
342
+ p = fossil_search_init(g.argv[2], zBegin, zEnd, zGap, flg);
342343
 for(i=3; i<g.argc; i++){
343344
 blob_read_from_file(&x, g.argv[i]);
344345
 zDoc = blob_str(&x);
345346
 score = search_match(p, 1, (const char**)&zDoc);
346347
 fossil_print("%s: %d\n", g.argv[i], p->iScore);
@@ -380,19 +381,19 @@
380381
 zBegin = (const char*)sqlite3_value_text(argv[1]);
381382
 case 1:
382383
 zPattern = (const char*)sqlite3_value_text(argv[0]);
383384
 }
384385
 if( zPattern && zPattern[0] ){
385
- search_init(zPattern, zBegin, zEnd, zGap, flg | SRCHFLG_STATIC);
386
+ fossil_search_init(zPattern, zBegin, zEnd, zGap, flg | SRCHFLG_STATIC);
386387
 }else{
387388
 search_end(&gSearch);
388389
 }
389390
 }
390391
391392
 /*
392393
 ** Try to match the input text against the search parameters set up
393
-** by the previous search_init() call. Remember the results globally.
394
+** by the previous fossil_search_init() call. Remember the results globally.
394395
 ** Return non-zero on a match and zero on a miss.
395396
 */
396397
 static void search_match_sqlfunc(
397398
 sqlite3_context *context,
398399
 int argc,
@@ -559,11 +560,11 @@
559560
 if( g.argc<2 ) return;
560561
 blob_init(&pattern, g.argv[2], -1);
561562
 for(i=3; i<g.argc; i++){
562563
 blob_appendf(&pattern, " %s", g.argv[i]);
563564
 }
564
- (void)search_init(blob_str(&pattern),"*","*","...",SRCHFLG_STATIC);
565
+ (void)fossil_search_init(blob_str(&pattern),"*","*","...",SRCHFLG_STATIC);
565566
 blob_reset(&pattern);
566567
 search_sql_setup(g.db);
567568
568569
 db_multi_exec(
569570
 "CREATE TEMP TABLE srch(rid,uuid,date,comment,x);"
@@ -642,11 +643,11 @@
642643
 */
643644
 static void search_fullscan(
644645
 const char *zPattern, /* The query pattern */
645646
 unsigned int srchFlags /* What to search over */
646647
 ){
647
- search_init(zPattern, "<mark>", "</mark>", " ... ",
648
+ fossil_search_init(zPattern, "<mark>", "</mark>", " ... ",
648649
 SRCHFLG_STATIC|SRCHFLG_HTML);
649650
 if( (srchFlags & SRCH_DOC)!=0 ){
650651
 char *zDocGlob = db_get("doc-glob","");
651652
 char *zDocBr = db_get("doc-branch","trunk");
652653
 if( zDocGlob && zDocGlob[0] && zDocBr && zDocBr[0] ){
653654
--- src/search.c
+++ src/search.c
@@ -100,13 +100,14 @@
100 if( p!=&gSearch ) fossil_free(p);
101 }
102 }
103
104 /*
105 ** Compile a search pattern
 
106 */
107 Search *search_init(
108 const char *zPattern, /* The search pattern */
109 const char *zMarkBegin, /* Start of a match */
110 const char *zMarkEnd, /* End of a match */
111 const char *zMarkGap, /* A gap between two matches */
112 unsigned fSrchFlg /* Flags */
@@ -336,11 +337,11 @@
336 verify_all_options();
337 if( g.argc<4 ) usage("SEARCHSTRING FILE1...");
338 if( zBegin==0 ) zBegin = "[[";
339 if( zEnd==0 ) zEnd = "]]";
340 if( zGap==0 ) zGap = " ... ";
341 p = search_init(g.argv[2], zBegin, zEnd, zGap, flg);
342 for(i=3; i<g.argc; i++){
343 blob_read_from_file(&x, g.argv[i]);
344 zDoc = blob_str(&x);
345 score = search_match(p, 1, (const char**)&zDoc);
346 fossil_print("%s: %d\n", g.argv[i], p->iScore);
@@ -380,19 +381,19 @@
380 zBegin = (const char*)sqlite3_value_text(argv[1]);
381 case 1:
382 zPattern = (const char*)sqlite3_value_text(argv[0]);
383 }
384 if( zPattern && zPattern[0] ){
385 search_init(zPattern, zBegin, zEnd, zGap, flg | SRCHFLG_STATIC);
386 }else{
387 search_end(&gSearch);
388 }
389 }
390
391 /*
392 ** Try to match the input text against the search parameters set up
393 ** by the previous search_init() call. Remember the results globally.
394 ** Return non-zero on a match and zero on a miss.
395 */
396 static void search_match_sqlfunc(
397 sqlite3_context *context,
398 int argc,
@@ -559,11 +560,11 @@
559 if( g.argc<2 ) return;
560 blob_init(&pattern, g.argv[2], -1);
561 for(i=3; i<g.argc; i++){
562 blob_appendf(&pattern, " %s", g.argv[i]);
563 }
564 (void)search_init(blob_str(&pattern),"*","*","...",SRCHFLG_STATIC);
565 blob_reset(&pattern);
566 search_sql_setup(g.db);
567
568 db_multi_exec(
569 "CREATE TEMP TABLE srch(rid,uuid,date,comment,x);"
@@ -642,11 +643,11 @@
642 */
643 static void search_fullscan(
644 const char *zPattern, /* The query pattern */
645 unsigned int srchFlags /* What to search over */
646 ){
647 search_init(zPattern, "<mark>", "</mark>", " ... ",
648 SRCHFLG_STATIC|SRCHFLG_HTML);
649 if( (srchFlags & SRCH_DOC)!=0 ){
650 char *zDocGlob = db_get("doc-glob","");
651 char *zDocBr = db_get("doc-branch","trunk");
652 if( zDocGlob && zDocGlob[0] && zDocBr && zDocBr[0] ){
653
--- src/search.c
+++ src/search.c
@@ -100,13 +100,14 @@
100 if( p!=&gSearch ) fossil_free(p);
101 }
102 }
103
104 /*
105 ** Compile a search pattern. Can't call it search_init(), as that
106 ** conflicts with libedit.
107 */
108 Search *fossil_search_init(
109 const char *zPattern, /* The search pattern */
110 const char *zMarkBegin, /* Start of a match */
111 const char *zMarkEnd, /* End of a match */
112 const char *zMarkGap, /* A gap between two matches */
113 unsigned fSrchFlg /* Flags */
@@ -336,11 +337,11 @@
337 verify_all_options();
338 if( g.argc<4 ) usage("SEARCHSTRING FILE1...");
339 if( zBegin==0 ) zBegin = "[[";
340 if( zEnd==0 ) zEnd = "]]";
341 if( zGap==0 ) zGap = " ... ";
342 p = fossil_search_init(g.argv[2], zBegin, zEnd, zGap, flg);
343 for(i=3; i<g.argc; i++){
344 blob_read_from_file(&x, g.argv[i]);
345 zDoc = blob_str(&x);
346 score = search_match(p, 1, (const char**)&zDoc);
347 fossil_print("%s: %d\n", g.argv[i], p->iScore);
@@ -380,19 +381,19 @@
381 zBegin = (const char*)sqlite3_value_text(argv[1]);
382 case 1:
383 zPattern = (const char*)sqlite3_value_text(argv[0]);
384 }
385 if( zPattern && zPattern[0] ){
386 fossil_search_init(zPattern, zBegin, zEnd, zGap, flg | SRCHFLG_STATIC);
387 }else{
388 search_end(&gSearch);
389 }
390 }
391
392 /*
393 ** Try to match the input text against the search parameters set up
394 ** by the previous fossil_search_init() call. Remember the results globally.
395 ** Return non-zero on a match and zero on a miss.
396 */
397 static void search_match_sqlfunc(
398 sqlite3_context *context,
399 int argc,
@@ -559,11 +560,11 @@
560 if( g.argc<2 ) return;
561 blob_init(&pattern, g.argv[2], -1);
562 for(i=3; i<g.argc; i++){
563 blob_appendf(&pattern, " %s", g.argv[i]);
564 }
565 (void)fossil_search_init(blob_str(&pattern),"*","*","...",SRCHFLG_STATIC);
566 blob_reset(&pattern);
567 search_sql_setup(g.db);
568
569 db_multi_exec(
570 "CREATE TEMP TABLE srch(rid,uuid,date,comment,x);"
@@ -642,11 +643,11 @@
643 */
644 static void search_fullscan(
645 const char *zPattern, /* The query pattern */
646 unsigned int srchFlags /* What to search over */
647 ){
648 fossil_search_init(zPattern, "<mark>", "</mark>", " ... ",
649 SRCHFLG_STATIC|SRCHFLG_HTML);
650 if( (srchFlags & SRCH_DOC)!=0 ){
651 char *zDocGlob = db_get("doc-glob","");
652 char *zDocBr = db_get("doc-branch","trunk");
653 if( zDocGlob && zDocGlob[0] && zDocBr && zDocBr[0] ){
654

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button