ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

search: fix compilation when configured with --enable-tiny 

SVN revision 5748 could cause some 'else's to be orphaned.

This fixes https://savannah.gnu.org/bugs/?47610.

Reported-by: Thomas Rosenau <thomasr@fantasymail.de>
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
master
Benno Schulenberg 2016-04-04 19:38:57 +02:00
parent 5d1752c5e3
commit 284877104f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proto.h
View File

@ -595,8 +595,8 @@ void do_findnext(void);
#endif #endif
#if !defined(NANO_TINY) || !defined(DISABLE_BROWSER) #if !defined(NANO_TINY) || !defined(DISABLE_BROWSER)
void do_research(void); void do_research(void);
void go_looking(void);
#endif #endif
void go_looking(void);
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
int replace_regexp(char *string, bool create); int replace_regexp(char *string, bool create);
#endif #endif

6
src/search.c
View File

@ -228,14 +228,16 @@ int search_init(bool replacing, bool use_answer)
TOGGLE(BACKWARDS_SEARCH); TOGGLE(BACKWARDS_SEARCH);
backupstring = mallocstrcpy(backupstring, answer); backupstring = mallocstrcpy(backupstring, answer);
return 1; return 1;
} else
#endif #endif
#ifdef HAVE_REGEX_H #ifdef HAVE_REGEX_H
} else if (func == regexp_void) { if (func == regexp_void) {
TOGGLE(USE_REGEXP); TOGGLE(USE_REGEXP);
backupstring = mallocstrcpy(backupstring, answer); backupstring = mallocstrcpy(backupstring, answer);
return 1; return 1;
} else
#endif #endif
} else if (func == do_replace || func == flip_replace_void) { if (func == do_replace || func == flip_replace_void) {
backupstring = mallocstrcpy(backupstring, answer); backupstring = mallocstrcpy(backupstring, answer);
return -2; /* Call the opposite search function. */ return -2; /* Call the opposite search function. */
} else if (func == do_gotolinecolumn_void) { } else if (func == do_gotolinecolumn_void) {